summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2016-12-28 07:21:43 (GMT)
committerJiyoung Yun <jy910.yun@samsung.com>2017-02-21 05:47:08 (GMT)
commitd37bbe14c834a9a72f23620ad210f9d6698c544e (patch)
tree40c345dec00c1bf3ea5dae8a7d4606a08642733a
parentba8726ae16a608d2f2e0a774176482ac37059b58 (diff)
downloadcoreclr-d37bbe14c834a9a72f23620ad210f9d6698c544e.zip
coreclr-d37bbe14c834a9a72f23620ad210f9d6698c544e.tar.gz
coreclr-d37bbe14c834a9a72f23620ad210f9d6698c544e.tar.bz2
Add .clrinfo to %{tizennetdir}
This file contains a hash for CoreCLR commit. Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com> Change-Id: I880b2c4e89d448413b35da12d4a2f35c7266cd20
-rw-r--r--packaging/coreclr.spec36
1 files changed, 23 insertions, 13 deletions
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 944dc67..b04560e 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -12,8 +12,12 @@
%define skipmscorlib 0
%endif
+%define dotnet_version 1.0.0
+# git rev-parse --verify HEAD
+%define CORECLR_GIT_HASH 14b0b57cd9090080c9f4c35b9702713d0d328905
+
Name: coreclr
-Version: 1.1.0
+Version: 1.0.0.9127
Release: 0
Summary: Microsoft .NET Runtime, Coreclr
Group: Development/Languages
@@ -21,7 +25,7 @@ License: MIT
URL: http://github.com/dotnet/coreclr
Source0: %{name}-%{version}.tar.gz
Source1000: downloaded_files.tar.gz
-Source1001: %{name}.manifest
+Source1001: %{name}.manifest
Source1002: libicu.tar.gz
Source1003: dep_libs.tar.gz
# Gbp-Ignore-Patches: 0 1 2
@@ -109,10 +113,11 @@ tar xf %{SOURCE1000}
%ifarch armv7l
%setup -T -D -a 1002
%setup -T -D -a 1003
-patchelf --set-interpreter /emul/lib64/ld-linux-x86-64.so.2 ./Tools/dotnetcli/dotnet
-patchelf --set-rpath /emul/usr/lib64/:%{_builddir}/%{name}-%{version}/libicu/ ./Tools/dotnetcli/dotnet
-patchelf --set-interpreter /emul/lib64/ld-linux-x86-64.so.2 ./Tools/dotnetcli/shared/Microsoft.NETCore.App/1.0.0-rc3-002733/dotnet
-patchelf --set-rpath /emul/usr/lib64/:%{_builddir}/%{name}-%{version}/libicu/ ./Tools/dotnetcli/shared/Microsoft.NETCore.App/1.0.0-rc3-002733/dotnet
+for file in $( find ./Tools -name "dotnet" )
+do
+ patchelf --set-interpreter /emul/lib64/ld-linux-x86-64.so.2 $file
+ patchelf --set-rpath /emul/usr/lib64/:%{_builddir}/%{name}-%{version}/libicu/ $file
+done
for file in $( find ./Tools ./libicu -iname "*.so" -or -iname "*.so.*" )
do
patchelf --set-rpath /emul/usr/lib64/:%{_builddir}/%{name}-%{version}/libicu/ $file
@@ -131,9 +136,9 @@ done
%else
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/:/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/
export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/lib64/:/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/
-export CFLAGS="-B/usr/local/lib64/ -B/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/"
-export CPPFLAGS="-B/usr/local/lib64/ -B/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/"
-export CXXFLAGS="-B/usr/local/lib64/ -B/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/"
+export CFLAGS="-B/usr/local/lib64/ -B/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/ -Wno-deprecated-declarations"
+export CPPFLAGS="-B/usr/local/lib64/ -B/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/ -Wno-deprecated-declarations"
+export CXXFLAGS="-B/usr/local/lib64/ -B/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/ -Wno-deprecated-declarations"
export CPLUS_INCLUDE_PATH="/usr/local/include/llvm/:/usr/local/include/llvm-c/:/usr/local/lib64/clang/3.8.1/include/:/usr/include/:/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/include/:/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/include/c++/:/usr/lib64/gcc/x86_64-tizen-linux-gnu/4.9.2/include/c++/x86_64-tizen-linux-gnu/"
export C_INCLUDE_PATH="/usr/local/include/llvm-c/:/usr/include/"
%endif
@@ -177,9 +182,9 @@ export C_INCLUDE_PATH="/usr/include/llvm-c/:/usr/include/"
%else
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2
export LIBRARY_PATH=$LIBRARY_PATH:/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2
-export CFLAGS="-U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -B/usr/local/lib/ -B/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/ -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w"
-export CPPFLAGS="-U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -B/usr/local/lib/ -B/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/ -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w"
-export CXXFLAGS="-U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -B/usr/local/lib/ -B/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/ -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w"
+export CFLAGS="-U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -B/usr/local/lib/ -B/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/ -Wno-deprecated-declarations -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w"
+export CPPFLAGS="-U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -B/usr/local/lib/ -B/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/ -Wno-deprecated-declarations -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w"
+export CXXFLAGS="-U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -B/usr/local/lib/ -B/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/ -Wno-deprecated-declarations -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w"
export CPLUS_INCLUDE_PATH="/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/include/c++/:/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/include/c++/armv7l-tizen-linux-gnueabi/:/usr/local/include/llvm/:/usr/local/include/llvm-c/:/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/include/c++/:/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/include/c++/backward:/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/include/c++/armv7l-tizen-linux-gnueabi/:/usr/local/include:/usr/include/"
export C_INCLUDE_PATH="/usr/local/include/llvm-c/:/usr/include/"
%endif
@@ -237,11 +242,13 @@ export PAL_DBG_CHANNELS=""
%endif
%endif
+echo %{CORECLR_GIT_HASH} > .clrinfo
+
%install
# .NET Core Runtime
%define dotnetdir dotnet
%define netshareddir %{dotnetdir}/shared
-%define netcoreappdir %{netshareddir}/Microsoft.NETCore.App/1.1.0
+%define netcoreappdir %{netshareddir}/Microsoft.NETCore.App/%{dotnet_version}
mkdir -p %{buildroot}/opt/usr/share/%{netcoreappdir}
# .NET Tizen Runtime
@@ -296,6 +303,8 @@ mkdir -p %{buildroot}%{_datadir}
ln -sf /opt/usr/share/%{dotnetdir} %{buildroot}%{_datadir}/
ln -sf /opt/usr/share/%{dotnettizendir} %{buildroot}%{_datadir}/
ln -sf /opt/usr/share/%{tizennetdir} %{buildroot}%{_datadir}/
+
+cp -rf .clrinfo %{buildroot}/opt/usr/share/%{tizennetdir}
%endif
%if 0%{skipmscorlib}
@@ -324,6 +333,7 @@ ln -sf ../%{netcoreappdir}/SOS.NETCore.dll %{buildroot}/opt/usr/share/%{tize
/opt/usr/share/%{netcoreappdir}/corerun
/opt/usr/share/%{netcoreappdir}/*.so
/opt/usr/share/%{tizennetdir}/*
+/opt/usr/share/%{tizennetdir}/.clrinfo
/opt/usr/share/%{dotnetdir}/corerun
%dir %{_datadir}/%{dotnetdir}
%dir %{_datadir}/%{dotnettizendir}