From 3468d1381ea0e1f68c0e276249733492e1f7d0df Mon Sep 17 00:00:00 2001 From: Hyungju Lee Date: Fri, 12 Oct 2018 11:13:04 +0900 Subject: [PATCH] [Tizen] Rearrange executables among rpm pkgs - `corerun` and `coreconsole` to `devel` pkg - remove `extra` pkg and move symlinks in it. Change-Id: I99cd26121d3c83242caf6f2418d686b3ffcc2828 --- packaging/coreclr.spec | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index c1a262f..ff7ec6f 100755 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -81,13 +81,6 @@ BuildRequires: libopenssl-64bit %description The CoreCLR repo contains the complete runtime implementation for .NET Core. It includes RyuJIT, the .NET GC, native interop and many other components. It is cross-platform, with multiple OS and CPU ports in progress. -%package extra -Summary: Dotnet Core Extra Files -Requires: coreclr - -%description extra -Libsosplugin and others - %package test Summary: Dotnet Core Unit Test Requires: coreclr @@ -198,7 +191,7 @@ export CXXFLAGS+="-fstack-protector-strong" # Build native only. export NUGET_PACKAGES=%{_builddir}/%{name}-%{version}/.packages/ export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/libicu-57.1/ -./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -clang3.8 -skipmscorlib -skipgenerateversion -skipnuget -msbuildonunsupportedplatform cmakeargs "-DFEATURE_GDBJIT=TRUE -DFEATURE_PREJIT=true -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION=true -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro" %{_ngen_relocs_opts} +./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -clang3.8 -skipmscorlib -skipgenerateversion -skipnuget -msbuildonunsupportedplatform -cmakeargs "-DFEATURE_GDBJIT=TRUE -DFEATURE_PREJIT=true -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION=true -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro" %{_ngen_relocs_opts} %endif %else %if 0%{skipnative} @@ -210,7 +203,7 @@ export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/libicu-57.1/ # Build native and mscorlib. export NUGET_PACKAGES=%{_builddir}/%{name}-%{version}/.packages/ export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/libicu-57.1/ -./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -clang3.8 -skipgenerateversion -skiprestore -skiprestoreoptdata -skipnuget -skipcrossgen -msbuildonunsupportedplatform cmakeargs "-DFEATURE_GDBJIT=TRUE -DFEATURE_PREJIT=true -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION=true -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro" %{_ngen_relocs_opts} +./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -clang3.8 -skipgenerateversion -skiprestore -skiprestoreoptdata -skipnuget -skipcrossgen -msbuildonunsupportedplatform -cmakeargs "-DFEATURE_GDBJIT=TRUE -DFEATURE_PREJIT=true -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION=true -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro" %{_ngen_relocs_opts} %endif %endif @@ -248,7 +241,6 @@ cp %{_reldir}/libcoreclrtraceptprovider.so %{buildroot}%{_datadir}/%{netcoreappd cp %{_reldir}/System.Globalization.Native.so %{buildroot}%{_datadir}/%{netcoreappdir} cp %{_reldir}/coreconsole %{buildroot}%{_datadir}/%{netcoreappdir} cp %{_reldir}/crossgen %{buildroot}%{_datadir}/%{netcoreappdir} -ln -sf ../%{netcoreappdir}/corerun %{buildroot}%{_datadir}/%{dotnetdir}/corerun # .NET Core Headers and static libraries mkdir -p %{buildroot}%{_datadir}/%{netcoreappdir}/src/pal/src/ @@ -266,8 +258,9 @@ cp -rf src/pal/src/include %{buildroot}%{_datadir}/%{netcoreappdir}/src/pal/s cp -rf %{_reldir}/lib %{buildroot}%{_datadir}/%{netcoreappdir} # extra -ln -sf %{_datadir}/%{netcoreappdir}/coreconsole %{buildroot}%{_datadir}/%{dotnetfwdir}/coreconsole ln -sf %{_datadir}/%{netcoreappdir}/crossgen %{buildroot}%{_datadir}/%{dotnetfwdir}/crossgen +ln -sf %{_datadir}/%{netcoreappdir}/coreconsole %{buildroot}%{_datadir}/%{dotnetfwdir}/coreconsole +ln -sf ../%{netcoreappdir}/corerun %{buildroot}%{_datadir}/%{dotnetdir}/corerun # devel cp %{_reldir}/ilasm %{buildroot}%{_datadir}/%{dotnetfwdir} @@ -294,11 +287,9 @@ cp %{_reldir}/System.Private.CoreLib.dll %{buildroot}%{_datadir}/%{netcoreappdi %dir %{_datadir}/%{dotnetdir} %dir %{_datadir}/%{netcoreappdir} %dir %{_datadir}/%{dotnettizendir} -%{_datadir}/%{netcoreappdir}/corerun -%{_datadir}/%{netcoreappdir}/coreconsole %{_datadir}/%{netcoreappdir}/crossgen +%{_datadir}/%{dotnetfwdir}/crossgen %{_datadir}/%{netcoreappdir}/*.so -%{_datadir}/%{dotnetdir}/corerun %{_datadir}/%{dotnettizendir}/netcoreapp # symlink to .NET version for compatibility @@ -307,12 +298,6 @@ cp %{_reldir}/System.Private.CoreLib.dll %{buildroot}%{_datadir}/%{netcoreappdi %dir %{_datadir}/%{netshareddir}/Microsoft.NETCore.App/2.1.1 %dir %{_datadir}/%{netshareddir}/Microsoft.NETCore.App/2.1.4 -%files extra -%manifest %{name}.manifest -%dir %{_datadir}/%{dotnetfwdir} -%{_datadir}/%{dotnetfwdir}/coreconsole -%{_datadir}/%{dotnetfwdir}/crossgen - %files test %manifest %{name}.manifest %dir %{_datadir}/%{dotnettestdir} @@ -327,6 +312,10 @@ cp %{_reldir}/System.Private.CoreLib.dll %{buildroot}%{_datadir}/%{netcoreappdi %{_datadir}/%{netcoreappdir}/src/* %{_datadir}/%{dotnetfwdir}/ilasm %{_datadir}/%{dotnetfwdir}/ildasm +%{_datadir}/%{netcoreappdir}/corerun +%{_datadir}/%{netcoreappdir}/coreconsole +%{_datadir}/%{dotnetdir}/corerun +%{_datadir}/%{dotnetfwdir}/coreconsole %endif %if 0%{skipmscorlib} -- 2.7.4