summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVyacheslav Barinov <v.barinov@samsung.com>2015-02-16 10:36:14 +0300
committerVyacheslav Barinov <v.barinov@samsung.com>2015-02-17 10:26:35 +0300
commit464875f6086d4549a8ad2e46d68d44dbdfb803f5 (patch)
tree6da9ce3680b0ad2f6b3c86274f380f2910a0341e
parent9d0064fce246c1150d55ae585cb9dedcba763566 (diff)
downloadbinutils-464875f6086d4549a8ad2e46d68d44dbdfb803f5.tar.gz
binutils-464875f6086d4549a8ad2e46d68d44dbdfb803f5.tar.bz2
binutils-464875f6086d4549a8ad2e46d68d44dbdfb803f5.zip
termcap is now needed for build Change-Id: I8ae587311b4e4fe5dc5d419f361b0fd3f944ee7c Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>
-rw-r--r--packaging/binutils.spec20
-rw-r--r--packaging/cross-aarch64-binutils.spec20
-rw-r--r--packaging/cross-arm-binutils.spec20
-rw-r--r--packaging/cross-i386-binutils.spec20
4 files changed, 60 insertions, 20 deletions
diff --git a/packaging/binutils.spec b/packaging/binutils.spec
index 6b8093f9845..19f29b7c4ae 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 43d0e6476ae..9b00e9ef457 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 c9887a36df7..46e6a2f400f 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 9f68dabe26b..acd15fd8f37 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