diff options
author | Hyungju Lee <leee.lee@samsung.com> | 2018-09-21 14:30:51 +0900 |
---|---|---|
committer | 이형주/Tizen Platform Lab(SR)/Staff Engineer/삼성전자 <leee.lee@samsung.com> | 2018-09-21 14:50:52 +0900 |
commit | 7f0e07074405c0bc59e47035bf875385f4f1553d (patch) | |
tree | 75efe7a2ed5bb085122213526edf23672e37441d | |
parent | 9add87710582e8896044f08135ac114544ff2853 (diff) | |
download | corefx-tizen_base.tar.gz corefx-tizen_base.tar.bz2 corefx-tizen_base.zip |
[Tizen] build corefx-managed pkg for all archsubmit/tizen_base/20180921.060413submit/tizen_5.0_base/20181101.000001accepted/tizen/base/20180921.230955accepted/tizen/5.0/base/20181101.091330tizen_basetizen_5.0_baseaccepted/tizen_baseaccepted/tizen_5.0_base
The dependency of corefx-managed pkg being built only x64 arch is not
always desireable such as VD emulator having separate build system and
enabling only i586 build. So, corefx-managed is now built for every
arch.
-rwxr-xr-x | packaging/corefx.spec | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/packaging/corefx.spec b/packaging/corefx.spec index f49113aef2..4b00c1eeaf 100755 --- a/packaging/corefx.spec +++ b/packaging/corefx.spec @@ -11,7 +11,7 @@ %else %ifarch %{arm} %{ix86} %define skipnative 0 -%define skipmanaged 1 +%define skipmanaged 0 %else %define skipnative 1 %define skipmanaged 1 @@ -122,6 +122,7 @@ AutoReqProv: no %description managed-ref The managed part (.dll) of dotnet core foundational libraries for developer +%ifarch x86_64 %package test Summary: Dotnet Libraries Unit Test Requires: corefx-native @@ -131,6 +132,7 @@ AutoReqProv: no %description test Unit Test objs +%endif %prep %setup -q -n %{name}-%{version} @@ -148,10 +150,13 @@ EOF # Detect interpreter name from cross-gcc LD_INTERPRETER=$(patchelf --print-interpreter /emul/usr/bin/gcc) LD_RPATH=$(patchelf --print-rpath /emul/usr/bin/gcc) -for file in $( find ./Tools -name "dotnet" ) +for exec in dotnet ilasm do - patchelf --set-interpreter ${LD_INTERPRETER} ${file} - patchelf --set-rpath ${LD_RPATH}:%{_builddir}/%{name}-%{version}/libicu-57.1/ ${file} + for file in $( find ./Tools -type f -name $exec ) + do + patchelf --set-interpreter ${LD_INTERPRETER} ${file} + patchelf --set-rpath ${LD_RPATH}:%{_builddir}/%{name}-%{version}/libicu-57.1/ ${file} + done done for file in $( find ./Tools ./libicu-57.1 -iname "*.so" -or -iname "*.so.*" ! -iname "*.so.dbg" ) do @@ -220,8 +225,10 @@ cp -rf %{_reldir}/native/* bin/Linux.x64.%{buildtype}/native/ ./build-managed.sh -%{buildtype} -RuntimeOS=ubuntu.14.04 -- /p:BinPlaceNETCoreAppPackage=true /p:DotNetBuildOffline=true # Build test +%ifarch x86_64 ./build-tests.sh -%{buildtype} -Outerloop -SkipTests %endif +%endif %install # .NET Core Runtime @@ -250,9 +257,11 @@ cp %{_reldir}/native/System.IO.Compression.Native.so %{buildroot}%{_datadir}/%{n cp -rf %{_netcoreapp_runtime}/*.dll %{buildroot}%{_datadir}/%{netcoreappdir} # Copy files for test rpm +%ifarch x86_64 cp ./bin/tests %{buildroot}/opt/usr/%{tcdir} --parents -rf cp ./bin/testhost %{buildroot}/opt/usr/%{tcdir} --parents -rf cp ./run-test.sh %{buildroot}/opt/usr/%{tcdir}/ +%endif %endif @@ -282,11 +291,14 @@ native -p /sbin/ldconfig %manifest %{name}.manifest %{_datadir}/%{netcoreappdir}/*.dll +%ifarch x86_64 %files test %manifest %{name}.manifest /opt/usr/%{tcdir}/* %endif +%endif + %files managed-ref %manifest %{name}.manifest /nuget/*.nupkg |