packaging: Fix build breaks and packaging after upgrade to 2.39

Remove two additional directories related to gdb.

Package new shared libraries and remove libtool files.

Change-Id: I8deeb28b0a7a0ed9a51dea7d17ba4541d6415586
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/packaging/binutils-aarch64.spec b/packaging/binutils-aarch64.spec
index 8f85f1d..02e7542 100644 (file)
--- a/packaging/binutils-aarch64.spec
+++ b/packaging/binutils-aarch64.spec
@@ -137,7 +137,7 @@ export CXXFLAGS="${RPM_OPT_FLAGS}"
 rm -rf build-dir
 }
 # Remove gdb and sim since they have separate gdb package
-rm -rf gdb sim
+rm -rf gdb gdbserver gdbsupport sim
 
 mkdir -p build-dir
 cd build-dir
@@ -166,6 +166,7 @@ cd build-dir
        --enable-shared \
        --enable-new-dtags \
        --enable-relro=no \
+       --disable-gprofng \
 %ifarch %ix86
        --disable-separate-code
 %endif
@@ -246,7 +247,8 @@ rm -rf %{buildroot}%{_datadir}
 %{!?cross:
 %exclude %{_bindir}/ld.gold
 %exclude %{_prefix}/%{target_arch}/bin/ld.gold
-%{_libdir}/*.so
+%{_libdir}/*.so*
+%{_libdir}/bfd-plugins/*.so
 %{_prefix}/%{host_arch}/lib/ldscripts
 
 %files devel

diff --git a/packaging/binutils-armv7hl.spec b/packaging/binutils-armv7hl.spec
index 4576773..5030318 100644 (file)
--- a/packaging/binutils-armv7hl.spec
+++ b/packaging/binutils-armv7hl.spec
@@ -137,7 +137,7 @@ export CXXFLAGS="${RPM_OPT_FLAGS}"
 rm -rf build-dir
 }
 # Remove gdb and sim since they have separate gdb package
-rm -rf gdb sim
+rm -rf gdb gdbserver gdbsupport sim
 
 mkdir -p build-dir
 cd build-dir
@@ -166,6 +166,7 @@ cd build-dir
        --enable-shared \
        --enable-new-dtags \
        --enable-relro=no \
+       --disable-gprofng \
 %ifarch %ix86
        --disable-separate-code
 %endif
@@ -246,7 +247,8 @@ rm -rf %{buildroot}%{_datadir}
 %{!?cross:
 %exclude %{_bindir}/ld.gold
 %exclude %{_prefix}/%{target_arch}/bin/ld.gold
-%{_libdir}/*.so
+%{_libdir}/*.so*
+%{_libdir}/bfd-plugins/*.so
 %{_prefix}/%{host_arch}/lib/ldscripts
 
 %files devel

diff --git a/packaging/binutils-armv7l.spec b/packaging/binutils-armv7l.spec
index 90240ff..71bf6c2 100644 (file)
--- a/packaging/binutils-armv7l.spec
+++ b/packaging/binutils-armv7l.spec
@@ -137,7 +137,7 @@ export CXXFLAGS="${RPM_OPT_FLAGS}"
 rm -rf build-dir
 }
 # Remove gdb and sim since they have separate gdb package
-rm -rf gdb sim
+rm -rf gdb gdbserver gdbsupport sim
 
 mkdir -p build-dir
 cd build-dir
@@ -166,6 +166,7 @@ cd build-dir
        --enable-shared \
        --enable-new-dtags \
        --enable-relro=no \
+       --disable-gprofng \
 %ifarch %ix86
        --disable-separate-code
 %endif
@@ -246,7 +247,8 @@ rm -rf %{buildroot}%{_datadir}
 %{!?cross:
 %exclude %{_bindir}/ld.gold
 %exclude %{_prefix}/%{target_arch}/bin/ld.gold
-%{_libdir}/*.so
+%{_libdir}/*.so*
+%{_libdir}/bfd-plugins/*.so
 %{_prefix}/%{host_arch}/lib/ldscripts
 
 %files devel

diff --git a/packaging/binutils.spec b/packaging/binutils.spec
index 03ed285..39de19a 100644 (file)
--- a/packaging/binutils.spec
+++ b/packaging/binutils.spec
@@ -134,7 +134,7 @@ export CXXFLAGS="${RPM_OPT_FLAGS}"
 rm -rf build-dir
 }
 # Remove gdb and sim since they have separate gdb package
-rm -rf gdb sim
+rm -rf gdb gdbserver gdbsupport sim
 
 mkdir -p build-dir
 cd build-dir
@@ -163,6 +163,7 @@ cd build-dir
        --enable-shared \
        --enable-new-dtags \
        --enable-relro=no \
+       --disable-gprofng \
 %ifarch %ix86
        --disable-separate-code
 %endif
@@ -243,7 +244,8 @@ rm -rf %{buildroot}%{_datadir}
 %{!?cross:
 %exclude %{_bindir}/ld.gold
 %exclude %{_prefix}/%{target_arch}/bin/ld.gold
-%{_libdir}/*.so
+%{_libdir}/*.so*
+%{_libdir}/bfd-plugins/*.so
 %{_prefix}/%{host_arch}/lib/ldscripts
 
 %files devel