Mailinglist Archive: opensuse-commit (1177 mails)
| < Previous | Next > |
commit binutils for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 22 Jan 2009 16:48:05 +0100
- Message-id: <20090122154806.438EB6780A8@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package binutils for openSUSE:Factory
checked in at Thu Jan 22 16:48:05 CET 2009.
--------
--- binutils/binutils.changes 2009-01-19 18:19:48.000000000 +0100
+++ /mounts/work_src_done/STABLE/binutils/binutils.changes 2009-01-22
14:20:25.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 22 14:20:16 CET 2009 - schwab@xxxxxxx
+
+- Adjust list of extra targets.
+
+-------------------------------------------------------------------
cross-alpha-binutils.changes: same change
cross-arm-binutils.changes: same change
cross-avr-binutils.changes: same change
cross-hppa64-binutils.changes: same change
cross-hppa-binutils.changes: same change
cross-i386-binutils.changes: same change
cross-ia64-binutils.changes: same change
cross-mips-binutils.changes: same change
cross-ppc64-binutils.changes: same change
cross-ppc-binutils.changes: same change
cross-s390-binutils.changes: same change
cross-s390x-binutils.changes: same change
cross-sh4-binutils.changes: same change
cross-sparc-binutils.changes: same change
cross-spu-binutils.changes: same change
cross-x86_64-binutils.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:35.000000000 +0100
@@ -20,7 +20,7 @@
Name: binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -303,29 +303,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -336,11 +340,14 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -348,7 +355,8 @@
%ifarch %gold_archs
mkdir ../build-dir2
cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
+../configure %common_flags %extra_gold_targets \
+ --enable-shared --enable-gold --program-prefix=go
make %{?jobs:-j%jobs}
%endif
mkdir ../build-dir3
@@ -373,24 +381,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -408,7 +416,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -536,6 +544,8 @@
%{_libdir}/lib*.*a
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-alpha-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:35.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-alpha-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to ALPHA Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to ALPHA
-targets. This can be handy even if you are running on an ALPHA
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-arm-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:35.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-arm-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to ARM Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to ARM
-targets. This can be handy even if you are running on an ARM
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-avr-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:35.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-avr-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later
-Summary: GNU Binutils for Cross-Development to AVR Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to AVR
-targets. This can be handy even if you are running on an AVR
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-hppa64-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:35.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-hppa64-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to HPPA64 Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to HPPA64
-targets. This can be handy even if you are running on an HPPA
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-hppa-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:35.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-hppa-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to HPPA Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to HPPA
-targets. This can be handy even if you are running on an HPPA
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-i386-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:35.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-i386-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to X86 Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to X86
-targets. This can be handy even if you are running on an X86
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-ia64-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:35.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-ia64-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to IA64 Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to IA64
-targets. This can be handy even if you are running on an IA64
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-mips-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:36.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-mips-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to MIPS Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to MIPS
-targets. This can be handy even if you are running on a MIPS
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-ppc64-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:36.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-ppc64-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later
-Summary: GNU binutils for cross-development to PowerPC 64bit processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SuSE binutils package in that it is designed to
-cross-compile from whatever platform SuSE Linux is running on to
-PowerPC64 targets. This can be handy even if you are running on a
-PowerPC64 development platform, as it decouples the host tools from
-your embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-ppc-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:36.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-ppc-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to PowerPC Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to
-PowerPC targets. This can be handy even if you are running on a PowerPC
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-s390-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:36.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-s390-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to S/390 Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to S/390
-targets. This can be handy even if you are running on an S/390
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-s390x-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:36.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-s390x-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to 64-Bit S/390 Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to 64-bit
-S/390 targets. This can be handy even if you are running on a 64-bit
-S/390 development platform, because it decouples the host tools from
-your embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-sh4-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:36.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-sh4-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -155,82 +155,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later
-Summary: GNU binutils for Cross-Development to SH4 Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to SH4
-targets. This can be handy even if you are running on a SH4 development
-platform, because it decouples the host tools from your embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -271,29 +195,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -304,21 +232,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -328,10 +253,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -341,24 +262,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -376,7 +297,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -398,11 +319,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -432,9 +348,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -481,24 +394,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-sparc-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:36.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-sparc-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to SPARC Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to SPARC
-targets. This can be handy even if you are running on a SPARC
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-spu-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:36.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-spu-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to SPU Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to SPU
-targets. This can be handy even if you are running on an SPU
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ cross-x86_64-binutils.spec ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:36.000000000 +0100
@@ -20,7 +20,7 @@
Name: cross-x86_64-binutils
BuildRequires: bison dejagnu flex gcc-c++ zlib-devel
Version: 2.19.51
-Release: 1
+Release: 2
#
# RUN_TESTS
%define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -156,83 +156,6 @@
Torbjorn Granlund <tege@xxxxxxxxxx>
Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-%package gold
-License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
-Summary: GNU binutils for Cross-Development to X86-64 Processors
-AutoReqProv: on
-Requires: binutils = %{version}-%{release}
-Group: Development/Tools/Building
-%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
-
-%description gold
-Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy,
-objdump, ranlib, size, strings, strip. These utilities are needed
-whenever you want to compile a program or a kernel. This package
-differs from the normal SUSE binutils package in that it is designed to
-cross-compile from whatever platform SUSE Linux is running on to X86-64
-targets. This can be handy even if you are running on an X86-64
-development platform, because it decouples the host tools from your
-embedded tools.
-
-
-
-Authors:
---------
- Alan Modra <amodra@xxxxxxxxxxxxxx>
- Andreas Jaeger <aj@xxxxxxx>
- Andreas Schwab <schwab@xxxxxxx>
- Bill Cox <bill@xxxxxxxxxx>
- Brendan Kehoe <brendan@xxxxxxxxxx>
- D. V. Henkel-Wallace <gumby@xxxxxxxxxx>
- DJ Delorie <dj@xxxxxxxxxx>
- David D "Zoo" Zuhn <zoo@xxxxxxxxxx>
- David J. Mackenzie <djm@xxxxxxxxxx>
- Denis Chertykov <denisc@xxxxxxxxx>
- Diego Novillo <dnovillo@xxxxxxxxxx>
- Doug Evans <dje@xxxxxxxxxx>
- Eric Christopher <echristo@xxxxxxxxxx>
- Eric Youngdale <eric@xxxxxxx>
- Fred Fish <fnf@xxxxxxxxxx>
- Geoff Keating <geoffk@xxxxxxxxxx>
- H.J.Lu <hjl@xxxxxxx>
- Hans-Peter Nilsson <hp@xxxxxxxx>
- Ian Dall <dall@xxxxxxxxxxxxxxxx>
- Ian Taylor <ian@xxxxxxxxx>
- J.T. Conklin <jtc@xxxxxxxxxx>
- Jakub Jelinek <jakub@xxxxxxxxxx>
- Jan Hubicka <jh@xxxxxxx>
- Jason Eckhardt <jle@xxxxxxxxxx>
- Jason Merrill <jason@xxxxxxxxxx>
- Jeff Law <law@xxxxxxxxxx>
- Jeffrey Osier <jeffrey@xxxxxxxxxx>
- Jeffrey Wheat <cassidy@xxxxxxxxxx>
- Jim Kingdon <kingdon@xxxxxxxxxx>
- Jim Wilson <wilson@xxxxxxxxxx>
- John Gilmore <gnu@xxxxxxxxxx>
- J�rn Rennecke <amylaar@xxxxxxxxxx>
- K. Richard Pixley <rich@xxxxxxxxxx>
- Ken Raeburn <raeburn@xxxxxxxxxx>
- Kung Hsu <kung@xxxxxxxxxx>
- Mark Eichin <eichin@xxxxxxxxxx>
- Michael Meissner <meissner@xxxxxxxxxx>
- Michael Tiemann <tiemann@xxxxxxxxxx>
- Mike Werner <mtw@xxxxxxxxxx>
- Nick Clifton <nickc@xxxxxxxxxx>
- Per Bothner <bothner@xxxxxxxxxx>
- Peter Schauer <pes@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- Richard Earnshaw <rwe@xxxxxxxxxxxxxxxxxxxxx>
- Richard Henderson <rth@xxxxxxxxxx>
- Richard Stallman <rms@xxxxxxx>
- Rob Savoye <rob@xxxxxxxxxx>
- Roland H. Pesch <pesch@xxxxxxx>
- Sean Eric Fagan <sef@xxxxxxxxxx>
- Stan Shebs <shebs@xxxxxxxxx>
- Stephane Carrez <Stephane.Carrez@xxxxxxxxxxx>
- Steve Chamberlain <sac@xxxxxxxxxx>
- Stu Grossman <grossman@xxxxxxxxxx>
- Torbjorn Granlund <tege@xxxxxxxxxx>
- Ulf Carlsson <ulfc@xxxxxxxxxxxxxxxxxxxx>
-
%if "%{name}" != "binutils"
%define TARGET %(echo %{name} | sed -e
"s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
%endif
@@ -273,29 +196,33 @@
# Building native binutils
echo "Building native binutils."
%if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS powerpc-macos powerpc-macos10 spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf"
%if !%{test_vanilla}
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS i386-macos10"
+EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10"
%endif
%else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%endif
-ADDITIONAL_LD_TARGETS=
+EXTRA_LD_TARGETS=
%ifarch sparc
-ADDITIONAL_LD_TARGETS="sparc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux"
%endif
%ifarch ppc
-ADDITIONAL_LD_TARGETS="powerpc64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux"
%endif
%ifarch s390
-ADDITIONAL_LD_TARGETS="s390x-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux"
%endif
%ifarch s390x
-ADDITIONAL_LD_TARGETS="s390-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux"
%endif
%ifarch %ix86
-ADDITIONAL_LD_TARGETS="x86_64-suse-linux"
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux"
+%endif
+EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS
+%ifarch ppc ppc64
+EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf"
%endif
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} \\\
@@ -306,21 +233,18 @@
--with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --build=%{HOST} \\\
--disable-ld-targets \\\
- ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS//
/,}"} \\\
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
+%define extra_ld_targets \\\
+ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"}
+%define extra_gold_targets \\\
+ ${EXTRA_GOLD_TARGETS:+--enable-ld-targets="${EXTRA_GOLD_TARGETS#,}"}
mkdir build-dir
cd build-dir
-../configure %common_flags --enable-shared
+../configure %common_flags %extra_ld_targets --enable-shared
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
make %{?jobs:-j%jobs}
-%ifarch %gold_archs
-mkdir ../build-dir2
-cd ../build-dir2
-../configure %common_flags --enable-shared --enable-gold --program-prefix=go
-make %{?jobs:-j%jobs}
-%endif
mkdir ../build-dir3
cd ../build-dir3
../configure %common_flags --disable-shared
@@ -330,10 +254,6 @@
cd build-dir
%ifnarch %arm
make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" ||
%{make_check_handling}
-%ifarch %gold_archs
-cd ../build-dir2
-make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls"
|| :
-%endif
%endif
#
#
@@ -343,24 +263,24 @@
echo "Building cross binutils."
mkdir build-dir
cd build-dir
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
%if "%{TARGET}" == "sparc"
-ADDITIONAL_TARGETS="sparc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux"
%endif
%if "%{TARGET}" == "powerpc"
-ADDITIONAL_TARGETS="powerpc64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux"
%endif
%if "%{TARGET}" == "s390"
-ADDITIONAL_TARGETS="s390x-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux"
%endif
%if "%{TARGET}" == "s390x"
-ADDITIONAL_TARGETS="s390-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux"
%endif
%if "%{TARGET}" == "i586"
-ADDITIONAL_TARGETS="x86_64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
%endif
%if "%{TARGET}" == "hppa"
-ADDITIONAL_TARGETS="hppa64-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
%endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET}
@@ -378,7 +298,7 @@
%else
--with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif
- ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
# force reconfiguring
rm bfd/Makefile
@@ -400,11 +320,6 @@
cd build-dir
%if "%name" == "binutils"
# installing native binutils
-%ifarch %gold_archs
-cd ../build-dir2
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-cd ../build-dir
-%endif
make DESTDIR=$RPM_BUILD_ROOT install-info install
make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
cd ../build-dir3
@@ -434,9 +349,6 @@
%find_lang ld binutils.lang
%find_lang opcodes binutils.lang
%find_lang gprof binutils.lang
-#%ifarch %gold_archs
-#%find_lang gold binutils.lang
-#%endif
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
@@ -483,24 +395,16 @@
%{_prefix}/%{HOST}/lib/ldscripts
%{_libdir}/ldscripts
%{_bindir}/*
-%ifarch %gold_archs
-%exclude %{_bindir}/gold
-%endif
%doc %{_infodir}/*.gz
%{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz
%else
%{_prefix}
%endif
-%ifarch %gold_archs
-
-%files gold
-%defattr(-,root,root)
-%doc gold/NEWS gold/README
-%{_bindir}/gold
-%endif
%changelog
+* Thu Jan 22 2009 schwab@xxxxxxx
+- Adjust list of extra targets.
* Mon Jan 19 2009 schwab@xxxxxxx
- Update to head of trunk.
- Add gold.
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.Pa8042/_old 2009-01-22 16:46:37.000000000 +0100
+++ /var/tmp/diff_new_pack.Pa8042/_new 2009-01-22 16:46:37.000000000 +0100
@@ -8,7 +8,8 @@
ln -f binutils.changes cross-$arch-binutils.changes
sed -e "s/^Name:.*binutils\$/Name: cross-$arch-binutils/" \
- -e '/ devel$/,/^$/d' \
+ -e '/%ifarch %gold_archs/,/%endif/d' \
+ -e '/ \(devel\|gold\)$/,/^$/d' \
< binutils.spec > cross-$arch-binutils.spec
echo " done."
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |