From 464875f6086d4549a8ad2e46d68d44dbdfb803f5 Mon Sep 17 00:00:00 2001 From: Vyacheslav Barinov Date: Mon, 16 Feb 2015 10:36:14 +0300 Subject: [PATCH] packaging: bump to 2.25 termcap is now needed for build Change-Id: I8ae587311b4e4fe5dc5d419f361b0fd3f944ee7c Signed-off-by: Vyacheslav Barinov --- packaging/binutils.spec | 20 +++++++++++++++----- packaging/cross-aarch64-binutils.spec | 20 +++++++++++++++----- packaging/cross-arm-binutils.spec | 20 +++++++++++++++----- packaging/cross-i386-binutils.spec | 20 +++++++++++++++----- 4 files changed, 60 insertions(+), 20 deletions(-) diff --git a/packaging/binutils.spec b/packaging/binutils.spec index 6b8093f..19f29b7 100644 --- a/packaging/binutils.spec +++ b/packaging/binutils.spec @@ -6,10 +6,10 @@ BuildRequires: gcc-c++ BuildRequires: glibc-devel-static # for some gold tests BuildRequires: bc -BuildRequires: makeinfo +BuildRequires: makeinfo ncurses-devel BuildRequires: zlib-devel-static Requires(pre): update-alternatives -Version: 2.24.90 +Version: 2.25 Release: 0 # # RUN_TESTS @@ -258,6 +258,9 @@ make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +# We have gdb in separate package +rm -f %buildroot/%_bindir/gdb* + if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then mv "%buildroot/%_bindir"/{ld,ld.bfd}; else @@ -284,10 +287,10 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes,inproctrace}.so +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la # Remove unwanted files to shut up rpm -rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. #%find_lang binutils #%find_lang bfd binutils.lang @@ -319,6 +322,11 @@ rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_prefix}/lib* rm -rf $RPM_BUILD_ROOT%{_prefix}/include rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt + +# We have gdb in separate package +rm -f $RPM_BUILD_ROOT%{_bindir}/gdb* +rm -rf $RPM_BUILD_ROOT%{_datadir}/gdb + > ../binutils.lang %endif cd $RPM_BUILD_DIR/binutils-%version @@ -388,7 +396,9 @@ fi; %manifest %{name}.manifest %defattr(-,root,root) %{_prefix}/include/*.h +%{_prefix}/include/gdb/*.h %{_libdir}/lib*.*a +%{_datadir}/gdb/* %endif %changelog diff --git a/packaging/cross-aarch64-binutils.spec b/packaging/cross-aarch64-binutils.spec index 43d0e64..9b00e9e 100644 --- a/packaging/cross-aarch64-binutils.spec +++ b/packaging/cross-aarch64-binutils.spec @@ -9,10 +9,10 @@ BuildRequires: gcc-c++ BuildRequires: glibc-devel-static # for some gold tests BuildRequires: bc -BuildRequires: makeinfo +BuildRequires: makeinfo ncurses-devel BuildRequires: zlib-devel-static Requires(pre): update-alternatives -Version: 2.24.90 +Version: 2.25 Release: 0 # # RUN_TESTS @@ -259,6 +259,9 @@ make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +# We have gdb in separate package +rm -f %buildroot/%_bindir/gdb* + if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then mv "%buildroot/%_bindir"/{ld,ld.bfd}; else @@ -285,10 +288,10 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes,inproctrace}.so +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la # Remove unwanted files to shut up rpm -rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. #%find_lang binutils #%find_lang bfd binutils.lang @@ -320,6 +323,11 @@ rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_prefix}/lib* rm -rf $RPM_BUILD_ROOT%{_prefix}/include rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt + +# We have gdb in separate package +rm -f $RPM_BUILD_ROOT%{_bindir}/gdb* +rm -rf $RPM_BUILD_ROOT%{_datadir}/gdb + > ../binutils.lang %endif cd $RPM_BUILD_DIR/binutils-%version @@ -386,7 +394,9 @@ fi; %files devel %defattr(-,root,root) %{_prefix}/include/*.h +%{_prefix}/include/gdb/*.h %{_libdir}/lib*.*a +%{_datadir}/gdb/* %endif %changelog diff --git a/packaging/cross-arm-binutils.spec b/packaging/cross-arm-binutils.spec index c9887a3..46e6a2f 100644 --- a/packaging/cross-arm-binutils.spec +++ b/packaging/cross-arm-binutils.spec @@ -9,10 +9,10 @@ BuildRequires: gcc-c++ BuildRequires: glibc-devel-static # for some gold tests BuildRequires: bc -BuildRequires: makeinfo +BuildRequires: makeinfo ncurses-devel BuildRequires: zlib-devel-static Requires(pre): update-alternatives -Version: 2.24.90 +Version: 2.25 Release: 0 # # RUN_TESTS @@ -259,6 +259,9 @@ make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +# We have gdb in separate package +rm -f %buildroot/%_bindir/gdb* + if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then mv "%buildroot/%_bindir"/{ld,ld.bfd}; else @@ -285,10 +288,10 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes,inproctrace}.so +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la # Remove unwanted files to shut up rpm -rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. #%find_lang binutils #%find_lang bfd binutils.lang @@ -320,6 +323,11 @@ rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_prefix}/lib* rm -rf $RPM_BUILD_ROOT%{_prefix}/include rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt + +# We have gdb in separate package +rm -f $RPM_BUILD_ROOT%{_bindir}/gdb* +rm -rf $RPM_BUILD_ROOT%{_datadir}/gdb + > ../binutils.lang %endif cd $RPM_BUILD_DIR/binutils-%version @@ -386,7 +394,9 @@ fi; %files devel %defattr(-,root,root) %{_prefix}/include/*.h +%{_prefix}/include/gdb/*.h %{_libdir}/lib*.*a +%{_datadir}/gdb/* %endif %changelog diff --git a/packaging/cross-i386-binutils.spec b/packaging/cross-i386-binutils.spec index 9f68dab..acd15fd 100644 --- a/packaging/cross-i386-binutils.spec +++ b/packaging/cross-i386-binutils.spec @@ -9,10 +9,10 @@ BuildRequires: gcc-c++ BuildRequires: glibc-devel-static # for some gold tests BuildRequires: bc -BuildRequires: makeinfo +BuildRequires: makeinfo ncurses-devel BuildRequires: zlib-devel-static Requires(pre): update-alternatives -Version: 2.24.90 +Version: 2.25 Release: 0 # # RUN_TESTS @@ -259,6 +259,9 @@ make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +# We have gdb in separate package +rm -f %buildroot/%_bindir/gdb* + if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then mv "%buildroot/%_bindir"/{ld,ld.bfd}; else @@ -285,10 +288,10 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes,inproctrace}.so +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la # Remove unwanted files to shut up rpm -rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. #%find_lang binutils #%find_lang bfd binutils.lang @@ -320,6 +323,11 @@ rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_prefix}/lib* rm -rf $RPM_BUILD_ROOT%{_prefix}/include rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt + +# We have gdb in separate package +rm -f $RPM_BUILD_ROOT%{_bindir}/gdb* +rm -rf $RPM_BUILD_ROOT%{_datadir}/gdb + > ../binutils.lang %endif cd $RPM_BUILD_DIR/binutils-%version @@ -386,7 +394,9 @@ fi; %files devel %defattr(-,root,root) %{_prefix}/include/*.h +%{_prefix}/include/gdb/*.h %{_libdir}/lib*.*a +%{_datadir}/gdb/* %endif %changelog -- 2.7.4