packaging: Move static libs to separate package

Change-Id: Ic5a6f0024ba8bd4c41fdd77d9a1e70b6eee70d62
Signed-off-by: Slava Barinov <v.barinov@samsung.com>

diff --git a/packaging/gcc-aarch64.spec b/packaging/gcc-aarch64.spec
index cc0ff50..489262c 100644 (file)
--- a/packaging/gcc-aarch64.spec
+++ b/packaging/gcc-aarch64.spec
@@ -5,7 +5,7 @@
 # spec file for package gcc
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2015 Tizen
+# Copyright (c) 2015-2020 Tizen
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -91,7 +91,7 @@
 %define libdir %{!?cross:%{_libdir}}%{?cross:%{_prefix}/lib%{?aarch64:64}}
 %define libsubdir %{libdir}/gcc/%{target_arch}/%{version}
 
-Name:         gcc%{?cross:-%{cross}}
+Name:          gcc%{?cross:-%{cross}}
 # With generated files in src we could drop the following
 BuildRequires: bison
 BuildRequires: flex
@@ -662,8 +662,16 @@ BuildArch:  noarch
 %description -n sanitizer-sources
 Sanitizer family tools sources for external tools.
 
-%prep
+%{!?cross:
+%package devel-static
+Summary:       GNU GCC static libraries
+License:       GPL-3.0+
+Group:         Development/Languages
+%description devel-static
+This package contains static libraries from GCC
+}
 
+%prep
 %setup -q -n gcc-%{version}
 cp %{SOURCE20} .
 
@@ -913,12 +921,10 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %{_prefix}/lib/bfd-plugins/liblto_plugin.so
 %{libsubdir}/include-fixed/*
 %{libsubdir}/include/*.h
-%{libsubdir}/*.a
 %{libsubdir}/*.so
 %{libsubdir}/*.o
 %{libsubdir}/*.spec
 %{libdir}/*.so
-%{libdir}/*.a
 %{libsubdir}/include/sanitizer/*
 %ifarch %asan_arch
 %exclude %{libdir}/libasan.so
@@ -950,13 +956,22 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %{libdir}/libstdc++.a
 %{libdir}/libsupc++.a
 %{libsubdir}/include/c++/*
+%{libsubdir}/libstdc++fs.a
 %{_datadir}/gcc-%{version}/python/libstdcxx/*
+%ifarch x86_64
+%{libsubdir}/32/libstdc++.a
+%{libsubdir}/32/libsupc++.a
+%{libsubdir}/32/libstdc++fs.a
+%endif
 
 %files -n libgcc
 %manifest gcc.manifest
 %license COPYING3 COPYING.RUNTIME
 %defattr(-,root,root)
 %{libdir}/libgcc_s.so.*
+%{libsubdir}/libgcc.a
+%{libsubdir}/libgcc_eh.a
+%{libsubdir}/libgcov.a
 
 %files -n libgomp
 %manifest gcc.manifest
@@ -1043,6 +1058,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING.LIB
 %defattr(-,root,root)
 %{libdir}/libquadmath.so.*
+%{libdir}/libquadmath.a
 %endif
 
 %files -n cpp
@@ -1061,6 +1077,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %doc testresults/test_summary.txt
 %doc testresults/
 }
+
 %ifarch x86_64
 %files -n gcc-32bit
 %defattr(-,root,root)
@@ -1099,6 +1116,9 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING3 COPYING.RUNTIME
 %defattr(-,root,root)
 %{libsubdir}/32/libgcc_s.so.*
+%{libsubdir}/32/libgcc.a
+%{libsubdir}/32/libgcc_eh.a
+%{libsubdir}/32/libgcov.a
 
 %files -n libgomp-32bit
 %manifest gcc.manifest
@@ -1124,6 +1144,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING.LIB
 %defattr(-,root,root)
 %{libsubdir}/32/libquadmath.so.*
+%{libsubdir}/32/libquadmath.a
 %endif
 
 %ifarch %ubsan_arch
@@ -1151,4 +1172,46 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 /src/libsanitizer.tar.bz
 }
 
+%{!?cross:
+%files devel-static
+%manifest gcc.manifest
+%license COPYING.LIB
+%defattr(-,root,root)
+%{libdir}/libgomp.a
+%ifarch %itm_arch
+%{libdir}/libitm.a
+%endif
+%ifarch %asan_arch
+%{libdir}/libasan.a
+%endif
+%ifarch %lsan_arch
+%{libdir}/liblsan.a
+%endif
+%ifarch %ubsan_arch
+%{libdir}/libubsan.a
+%endif
+%ifarch %tsan_arch
+%{libdir}/libtsan.a
+%endif
+%{libdir}/libatomic.a
+%{libsubdir}/libcaf_single.a
+%ifarch %x86_64
+%{libsubdir}/32/libgomp.a
+%ifarch %itm_arch
+%{libsubdir}/32/libitm.a
+%endif
+%ifarch %asan_arch
+%{libsubdir}/32/libasan.a
+%endif
+%ifarch %lsan_arch
+%{libsubdir}/32/liblsan.a
+%endif
+%ifarch %ubsan_arch
+%{libsubdir}/32/libubsan.a
+%endif
+%{libsubdir}/32/libatomic.a
+%{libsubdir}/32/libcaf_single.a
+%endif
+}
+
 %changelog

diff --git a/packaging/gcc-armv7hl.spec b/packaging/gcc-armv7hl.spec
index 5ec5d8e..da58f59 100644 (file)
--- a/packaging/gcc-armv7hl.spec
+++ b/packaging/gcc-armv7hl.spec
@@ -5,7 +5,7 @@
 # spec file for package gcc
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2015 Tizen
+# Copyright (c) 2015-2020 Tizen
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -91,7 +91,7 @@
 %define libdir %{!?cross:%{_libdir}}%{?cross:%{_prefix}/lib%{?aarch64:64}}
 %define libsubdir %{libdir}/gcc/%{target_arch}/%{version}
 
-Name:         gcc%{?cross:-%{cross}}
+Name:          gcc%{?cross:-%{cross}}
 # With generated files in src we could drop the following
 BuildRequires: bison
 BuildRequires: flex
@@ -662,8 +662,16 @@ BuildArch:  noarch
 %description -n sanitizer-sources
 Sanitizer family tools sources for external tools.
 
-%prep
+%{!?cross:
+%package devel-static
+Summary:       GNU GCC static libraries
+License:       GPL-3.0+
+Group:         Development/Languages
+%description devel-static
+This package contains static libraries from GCC
+}
 
+%prep
 %setup -q -n gcc-%{version}
 cp %{SOURCE20} .
 
@@ -913,12 +921,10 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %{_prefix}/lib/bfd-plugins/liblto_plugin.so
 %{libsubdir}/include-fixed/*
 %{libsubdir}/include/*.h
-%{libsubdir}/*.a
 %{libsubdir}/*.so
 %{libsubdir}/*.o
 %{libsubdir}/*.spec
 %{libdir}/*.so
-%{libdir}/*.a
 %{libsubdir}/include/sanitizer/*
 %ifarch %asan_arch
 %exclude %{libdir}/libasan.so
@@ -950,13 +956,22 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %{libdir}/libstdc++.a
 %{libdir}/libsupc++.a
 %{libsubdir}/include/c++/*
+%{libsubdir}/libstdc++fs.a
 %{_datadir}/gcc-%{version}/python/libstdcxx/*
+%ifarch x86_64
+%{libsubdir}/32/libstdc++.a
+%{libsubdir}/32/libsupc++.a
+%{libsubdir}/32/libstdc++fs.a
+%endif
 
 %files -n libgcc
 %manifest gcc.manifest
 %license COPYING3 COPYING.RUNTIME
 %defattr(-,root,root)
 %{libdir}/libgcc_s.so.*
+%{libsubdir}/libgcc.a
+%{libsubdir}/libgcc_eh.a
+%{libsubdir}/libgcov.a
 
 %files -n libgomp
 %manifest gcc.manifest
@@ -1043,6 +1058,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING.LIB
 %defattr(-,root,root)
 %{libdir}/libquadmath.so.*
+%{libdir}/libquadmath.a
 %endif
 
 %files -n cpp
@@ -1061,6 +1077,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %doc testresults/test_summary.txt
 %doc testresults/
 }
+
 %ifarch x86_64
 %files -n gcc-32bit
 %defattr(-,root,root)
@@ -1099,6 +1116,9 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING3 COPYING.RUNTIME
 %defattr(-,root,root)
 %{libsubdir}/32/libgcc_s.so.*
+%{libsubdir}/32/libgcc.a
+%{libsubdir}/32/libgcc_eh.a
+%{libsubdir}/32/libgcov.a
 
 %files -n libgomp-32bit
 %manifest gcc.manifest
@@ -1124,6 +1144,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING.LIB
 %defattr(-,root,root)
 %{libsubdir}/32/libquadmath.so.*
+%{libsubdir}/32/libquadmath.a
 %endif
 
 %ifarch %ubsan_arch
@@ -1151,4 +1172,46 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 /src/libsanitizer.tar.bz
 }
 
+%{!?cross:
+%files devel-static
+%manifest gcc.manifest
+%license COPYING.LIB
+%defattr(-,root,root)
+%{libdir}/libgomp.a
+%ifarch %itm_arch
+%{libdir}/libitm.a
+%endif
+%ifarch %asan_arch
+%{libdir}/libasan.a
+%endif
+%ifarch %lsan_arch
+%{libdir}/liblsan.a
+%endif
+%ifarch %ubsan_arch
+%{libdir}/libubsan.a
+%endif
+%ifarch %tsan_arch
+%{libdir}/libtsan.a
+%endif
+%{libdir}/libatomic.a
+%{libsubdir}/libcaf_single.a
+%ifarch %x86_64
+%{libsubdir}/32/libgomp.a
+%ifarch %itm_arch
+%{libsubdir}/32/libitm.a
+%endif
+%ifarch %asan_arch
+%{libsubdir}/32/libasan.a
+%endif
+%ifarch %lsan_arch
+%{libsubdir}/32/liblsan.a
+%endif
+%ifarch %ubsan_arch
+%{libsubdir}/32/libubsan.a
+%endif
+%{libsubdir}/32/libatomic.a
+%{libsubdir}/32/libcaf_single.a
+%endif
+}
+
 %changelog

diff --git a/packaging/gcc-armv7l.spec b/packaging/gcc-armv7l.spec
index 044feec..a85f96c 100644 (file)
--- a/packaging/gcc-armv7l.spec
+++ b/packaging/gcc-armv7l.spec
@@ -5,7 +5,7 @@
 # spec file for package gcc
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2015 Tizen
+# Copyright (c) 2015-2020 Tizen
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -91,7 +91,7 @@
 %define libdir %{!?cross:%{_libdir}}%{?cross:%{_prefix}/lib%{?aarch64:64}}
 %define libsubdir %{libdir}/gcc/%{target_arch}/%{version}
 
-Name:         gcc%{?cross:-%{cross}}
+Name:          gcc%{?cross:-%{cross}}
 # With generated files in src we could drop the following
 BuildRequires: bison
 BuildRequires: flex
@@ -662,8 +662,16 @@ BuildArch:  noarch
 %description -n sanitizer-sources
 Sanitizer family tools sources for external tools.
 
-%prep
+%{!?cross:
+%package devel-static
+Summary:       GNU GCC static libraries
+License:       GPL-3.0+
+Group:         Development/Languages
+%description devel-static
+This package contains static libraries from GCC
+}
 
+%prep
 %setup -q -n gcc-%{version}
 cp %{SOURCE20} .
 
@@ -913,12 +921,10 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %{_prefix}/lib/bfd-plugins/liblto_plugin.so
 %{libsubdir}/include-fixed/*
 %{libsubdir}/include/*.h
-%{libsubdir}/*.a
 %{libsubdir}/*.so
 %{libsubdir}/*.o
 %{libsubdir}/*.spec
 %{libdir}/*.so
-%{libdir}/*.a
 %{libsubdir}/include/sanitizer/*
 %ifarch %asan_arch
 %exclude %{libdir}/libasan.so
@@ -950,13 +956,22 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %{libdir}/libstdc++.a
 %{libdir}/libsupc++.a
 %{libsubdir}/include/c++/*
+%{libsubdir}/libstdc++fs.a
 %{_datadir}/gcc-%{version}/python/libstdcxx/*
+%ifarch x86_64
+%{libsubdir}/32/libstdc++.a
+%{libsubdir}/32/libsupc++.a
+%{libsubdir}/32/libstdc++fs.a
+%endif
 
 %files -n libgcc
 %manifest gcc.manifest
 %license COPYING3 COPYING.RUNTIME
 %defattr(-,root,root)
 %{libdir}/libgcc_s.so.*
+%{libsubdir}/libgcc.a
+%{libsubdir}/libgcc_eh.a
+%{libsubdir}/libgcov.a
 
 %files -n libgomp
 %manifest gcc.manifest
@@ -1043,6 +1058,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING.LIB
 %defattr(-,root,root)
 %{libdir}/libquadmath.so.*
+%{libdir}/libquadmath.a
 %endif
 
 %files -n cpp
@@ -1061,6 +1077,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %doc testresults/test_summary.txt
 %doc testresults/
 }
+
 %ifarch x86_64
 %files -n gcc-32bit
 %defattr(-,root,root)
@@ -1099,6 +1116,9 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING3 COPYING.RUNTIME
 %defattr(-,root,root)
 %{libsubdir}/32/libgcc_s.so.*
+%{libsubdir}/32/libgcc.a
+%{libsubdir}/32/libgcc_eh.a
+%{libsubdir}/32/libgcov.a
 
 %files -n libgomp-32bit
 %manifest gcc.manifest
@@ -1124,6 +1144,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING.LIB
 %defattr(-,root,root)
 %{libsubdir}/32/libquadmath.so.*
+%{libsubdir}/32/libquadmath.a
 %endif
 
 %ifarch %ubsan_arch
@@ -1151,4 +1172,46 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 /src/libsanitizer.tar.bz
 }
 
+%{!?cross:
+%files devel-static
+%manifest gcc.manifest
+%license COPYING.LIB
+%defattr(-,root,root)
+%{libdir}/libgomp.a
+%ifarch %itm_arch
+%{libdir}/libitm.a
+%endif
+%ifarch %asan_arch
+%{libdir}/libasan.a
+%endif
+%ifarch %lsan_arch
+%{libdir}/liblsan.a
+%endif
+%ifarch %ubsan_arch
+%{libdir}/libubsan.a
+%endif
+%ifarch %tsan_arch
+%{libdir}/libtsan.a
+%endif
+%{libdir}/libatomic.a
+%{libsubdir}/libcaf_single.a
+%ifarch %x86_64
+%{libsubdir}/32/libgomp.a
+%ifarch %itm_arch
+%{libsubdir}/32/libitm.a
+%endif
+%ifarch %asan_arch
+%{libsubdir}/32/libasan.a
+%endif
+%ifarch %lsan_arch
+%{libsubdir}/32/liblsan.a
+%endif
+%ifarch %ubsan_arch
+%{libsubdir}/32/libubsan.a
+%endif
+%{libsubdir}/32/libatomic.a
+%{libsubdir}/32/libcaf_single.a
+%endif
+}
+
 %changelog

diff --git a/packaging/gcc.spec b/packaging/gcc.spec
index 34a5467..6acee8d 100644 (file)
--- a/packaging/gcc.spec
+++ b/packaging/gcc.spec
@@ -2,7 +2,7 @@
 # spec file for package gcc
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2015 Tizen
+# Copyright (c) 2015-2020 Tizen
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -88,7 +88,7 @@
 %define libdir %{!?cross:%{_libdir}}%{?cross:%{_prefix}/lib%{?aarch64:64}}
 %define libsubdir %{libdir}/gcc/%{target_arch}/%{version}
 
-Name:         gcc%{?cross:-%{cross}}
+Name:          gcc%{?cross:-%{cross}}
 # With generated files in src we could drop the following
 BuildRequires: bison
 BuildRequires: flex
@@ -659,8 +659,16 @@ BuildArch:  noarch
 %description -n sanitizer-sources
 Sanitizer family tools sources for external tools.
 
-%prep
+%{!?cross:
+%package devel-static
+Summary:       GNU GCC static libraries
+License:       GPL-3.0+
+Group:         Development/Languages
+%description devel-static
+This package contains static libraries from GCC
+}
 
+%prep
 %setup -q -n gcc-%{version}
 cp %{SOURCE20} .
 
@@ -910,12 +918,10 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %{_prefix}/lib/bfd-plugins/liblto_plugin.so
 %{libsubdir}/include-fixed/*
 %{libsubdir}/include/*.h
-%{libsubdir}/*.a
 %{libsubdir}/*.so
 %{libsubdir}/*.o
 %{libsubdir}/*.spec
 %{libdir}/*.so
-%{libdir}/*.a
 %{libsubdir}/include/sanitizer/*
 %ifarch %asan_arch
 %exclude %{libdir}/libasan.so
@@ -947,13 +953,22 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %{libdir}/libstdc++.a
 %{libdir}/libsupc++.a
 %{libsubdir}/include/c++/*
+%{libsubdir}/libstdc++fs.a
 %{_datadir}/gcc-%{version}/python/libstdcxx/*
+%ifarch x86_64
+%{libsubdir}/32/libstdc++.a
+%{libsubdir}/32/libsupc++.a
+%{libsubdir}/32/libstdc++fs.a
+%endif
 
 %files -n libgcc
 %manifest gcc.manifest
 %license COPYING3 COPYING.RUNTIME
 %defattr(-,root,root)
 %{libdir}/libgcc_s.so.*
+%{libsubdir}/libgcc.a
+%{libsubdir}/libgcc_eh.a
+%{libsubdir}/libgcov.a
 
 %files -n libgomp
 %manifest gcc.manifest
@@ -1040,6 +1055,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING.LIB
 %defattr(-,root,root)
 %{libdir}/libquadmath.so.*
+%{libdir}/libquadmath.a
 %endif
 
 %files -n cpp
@@ -1058,6 +1074,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %doc testresults/test_summary.txt
 %doc testresults/
 }
+
 %ifarch x86_64
 %files -n gcc-32bit
 %defattr(-,root,root)
@@ -1096,6 +1113,9 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING3 COPYING.RUNTIME
 %defattr(-,root,root)
 %{libsubdir}/32/libgcc_s.so.*
+%{libsubdir}/32/libgcc.a
+%{libsubdir}/32/libgcc_eh.a
+%{libsubdir}/32/libgcov.a
 
 %files -n libgomp-32bit
 %manifest gcc.manifest
@@ -1121,6 +1141,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %license COPYING.LIB
 %defattr(-,root,root)
 %{libsubdir}/32/libquadmath.so.*
+%{libsubdir}/32/libquadmath.a
 %endif
 
 %ifarch %ubsan_arch
@@ -1148,4 +1169,46 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 /src/libsanitizer.tar.bz
 }
 
+%{!?cross:
+%files devel-static
+%manifest gcc.manifest
+%license COPYING.LIB
+%defattr(-,root,root)
+%{libdir}/libgomp.a
+%ifarch %itm_arch
+%{libdir}/libitm.a
+%endif
+%ifarch %asan_arch
+%{libdir}/libasan.a
+%endif
+%ifarch %lsan_arch
+%{libdir}/liblsan.a
+%endif
+%ifarch %ubsan_arch
+%{libdir}/libubsan.a
+%endif
+%ifarch %tsan_arch
+%{libdir}/libtsan.a
+%endif
+%{libdir}/libatomic.a
+%{libsubdir}/libcaf_single.a
+%ifarch %x86_64
+%{libsubdir}/32/libgomp.a
+%ifarch %itm_arch
+%{libsubdir}/32/libitm.a
+%endif
+%ifarch %asan_arch
+%{libsubdir}/32/libasan.a
+%endif
+%ifarch %lsan_arch
+%{libsubdir}/32/liblsan.a
+%endif
+%ifarch %ubsan_arch
+%{libsubdir}/32/libubsan.a
+%endif
+%{libsubdir}/32/libatomic.a
+%{libsubdir}/32/libcaf_single.a
+%endif
+}
+
 %changelog