summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpackaging/coreclr.spec29
1 files changed, 9 insertions, 20 deletions
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 6b84abc..06c86f1 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
@@ -190,7 +183,7 @@ export CXXFLAGS+="-fstack-protector-strong"
# No build native and mscorlib.
%else
# Build native only.
-./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -clang3.8 -skipmscorlib -skipgenerateversion -skipnuget -msbuildonunsupportedplatform cmakeargs "-DFEATURE_GDBJIT=TRUE -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro"
+./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -clang3.8 -skipmscorlib -skipgenerateversion -skipnuget -msbuildonunsupportedplatform -cmakeargs "-DFEATURE_GDBJIT=TRUE -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro"
%endif
%else
%if 0%{skipnative}
@@ -198,7 +191,7 @@ export CXXFLAGS+="-fstack-protector-strong"
./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -skiprestore -skipnative -skipnuget -skipcrossgen -msbuildonunsupportedplatform
%else
# Build native and mscorlib.
-./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -clang3.8 -skipgenerateversion -skiprestore -skipnuget -skipcrossgen -msbuildonunsupportedplatform cmakeargs "-DFEATURE_GDBJIT=TRUE -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro"
+./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -clang3.8 -skipgenerateversion -skiprestore -skipnuget -skipcrossgen -msbuildonunsupportedplatform -cmakeargs "-DFEATURE_GDBJIT=TRUE -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro"
%endif
%endif
@@ -238,7 +231,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/
@@ -258,8 +250,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}
@@ -287,11 +280,9 @@ cp %{_reldir}/SOS.NETCore.dll %{buildroot}%{_datadir}/%{netcoreappdir}
%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
@@ -300,12 +291,6 @@ cp %{_reldir}/SOS.NETCore.dll %{buildroot}%{_datadir}/%{netcoreappdir}
%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}
@@ -320,6 +305,10 @@ cp %{_reldir}/SOS.NETCore.dll %{buildroot}%{_datadir}/%{netcoreappdir}
%{_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}