From 2ef459be03ae35876586f7c8aad7e7a8067daab630618559086e96e348554e26 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 22 Jan 2009 15:48:12 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/binutils?expand=0&rev=32 --- binutils.changes | 5 ++ binutils.spec | 56 +++++++----- cross-alpha-binutils.changes | 5 ++ cross-alpha-binutils.spec | 158 +++++++--------------------------- cross-arm-binutils.changes | 5 ++ cross-arm-binutils.spec | 158 +++++++--------------------------- cross-avr-binutils.changes | 5 ++ cross-avr-binutils.spec | 158 +++++++--------------------------- cross-hppa-binutils.changes | 5 ++ cross-hppa-binutils.spec | 158 +++++++--------------------------- cross-hppa64-binutils.changes | 5 ++ cross-hppa64-binutils.spec | 158 +++++++--------------------------- cross-i386-binutils.changes | 5 ++ cross-i386-binutils.spec | 158 +++++++--------------------------- cross-ia64-binutils.changes | 5 ++ cross-ia64-binutils.spec | 158 +++++++--------------------------- cross-mips-binutils.changes | 5 ++ cross-mips-binutils.spec | 158 +++++++--------------------------- cross-ppc-binutils.changes | 5 ++ cross-ppc-binutils.spec | 158 +++++++--------------------------- cross-ppc64-binutils.changes | 5 ++ cross-ppc64-binutils.spec | 158 +++++++--------------------------- cross-s390-binutils.changes | 5 ++ cross-s390-binutils.spec | 158 +++++++--------------------------- cross-s390x-binutils.changes | 5 ++ cross-s390x-binutils.spec | 158 +++++++--------------------------- cross-sh4-binutils.changes | 5 ++ cross-sh4-binutils.spec | 157 +++++++-------------------------- cross-sparc-binutils.changes | 5 ++ cross-sparc-binutils.spec | 158 +++++++--------------------------- cross-spu-binutils.changes | 5 ++ cross-spu-binutils.spec | 158 +++++++--------------------------- cross-x86_64-binutils.changes | 5 ++ cross-x86_64-binutils.spec | 158 +++++++--------------------------- pre_checkin.sh | 3 +- 35 files changed, 616 insertions(+), 2055 deletions(-) diff --git a/binutils.changes b/binutils.changes index 3239774..a2031e2 100644 --- a/binutils.changes +++ b/binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/binutils.spec b/binutils.spec index 5f9ee1d..100a07a 100644 --- a/binutils.spec +++ b/binutils.spec @@ -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 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} %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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.*a %changelog +* Thu Jan 22 2009 schwab@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-alpha-binutils.changes b/cross-alpha-binutils.changes index 3239774..a2031e2 100644 --- a/cross-alpha-binutils.changes +++ b/cross-alpha-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec index fd66fc2..7776af6 100644 --- a/cross-alpha-binutils.spec +++ b/cross-alpha-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes index 3239774..a2031e2 100644 --- a/cross-arm-binutils.changes +++ b/cross-arm-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec index 24f9f16..64fbf74 100644 --- a/cross-arm-binutils.spec +++ b/cross-arm-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes index 3239774..a2031e2 100644 --- a/cross-avr-binutils.changes +++ b/cross-avr-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec index 330a251..6c61de8 100644 --- a/cross-avr-binutils.spec +++ b/cross-avr-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes index 3239774..a2031e2 100644 --- a/cross-hppa-binutils.changes +++ b/cross-hppa-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec index 0d77cdd..c90aea6 100644 --- a/cross-hppa-binutils.spec +++ b/cross-hppa-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes index 3239774..a2031e2 100644 --- a/cross-hppa64-binutils.changes +++ b/cross-hppa64-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec index 3589323..8d36182 100644 --- a/cross-hppa64-binutils.spec +++ b/cross-hppa64-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes index 3239774..a2031e2 100644 --- a/cross-i386-binutils.changes +++ b/cross-i386-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec index 81ac5ee..2a05c92 100644 --- a/cross-i386-binutils.spec +++ b/cross-i386-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes index 3239774..a2031e2 100644 --- a/cross-ia64-binutils.changes +++ b/cross-ia64-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec index 6b94442..775afba 100644 --- a/cross-ia64-binutils.spec +++ b/cross-ia64-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes index 3239774..a2031e2 100644 --- a/cross-mips-binutils.changes +++ b/cross-mips-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec index b331c92..d21d269 100644 --- a/cross-mips-binutils.spec +++ b/cross-mips-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes index 3239774..a2031e2 100644 --- a/cross-ppc-binutils.changes +++ b/cross-ppc-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec index f5c3f57..22b091f 100644 --- a/cross-ppc-binutils.spec +++ b/cross-ppc-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes index 3239774..a2031e2 100644 --- a/cross-ppc64-binutils.changes +++ b/cross-ppc64-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec index 5d6bb90..ed09f9c 100644 --- a/cross-ppc64-binutils.spec +++ b/cross-ppc64-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ your embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes index 3239774..a2031e2 100644 --- a/cross-s390-binutils.changes +++ b/cross-s390-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec index 04d3640..264ae0d 100644 --- a/cross-s390-binutils.spec +++ b/cross-s390-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes index 3239774..a2031e2 100644 --- a/cross-s390x-binutils.changes +++ b/cross-s390x-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec index 02e05fc..9601e45 100644 --- a/cross-s390x-binutils.spec +++ b/cross-s390x-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ your embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-sh4-binutils.changes b/cross-sh4-binutils.changes index 3239774..a2031e2 100644 --- a/cross-sh4-binutils.changes +++ b/cross-sh4-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-sh4-binutils.spec b/cross-sh4-binutils.spec index 617d245..68d550f 100644 --- a/cross-sh4-binutils.spec +++ b/cross-sh4-binutils.spec @@ -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 $?) @@ -98,82 +98,6 @@ platform, because it decouples the host tools from your embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -271,29 +195,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes index 3239774..a2031e2 100644 --- a/cross-sparc-binutils.changes +++ b/cross-sparc-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec index e6e13b9..4b91464 100644 --- a/cross-sparc-binutils.spec +++ b/cross-sparc-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes index 3239774..a2031e2 100644 --- a/cross-spu-binutils.changes +++ b/cross-spu-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec index 5a83bdd..2667922 100644 --- a/cross-spu-binutils.spec +++ b/cross-spu-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes index 3239774..a2031e2 100644 --- a/cross-x86_64-binutils.changes +++ b/cross-x86_64-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 22 14:20:16 CET 2009 - schwab@suse.de + +- Adjust list of extra targets. + ------------------------------------------------------------------- Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec index 384f6a9..b2e1006 100644 --- a/cross-x86_64-binutils.spec +++ b/cross-x86_64-binutils.spec @@ -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 $?) @@ -99,83 +99,6 @@ embedded tools. -Authors: --------- - Alan Modra - Andreas Jaeger - Andreas Schwab - Bill Cox - Brendan Kehoe - D. V. Henkel-Wallace - DJ Delorie - David D "Zoo" Zuhn - David J. Mackenzie - Denis Chertykov - Diego Novillo - Doug Evans - Eric Christopher - Eric Youngdale - Fred Fish - Geoff Keating - H.J.Lu - Hans-Peter Nilsson - Ian Dall - Ian Taylor - J.T. Conklin - Jakub Jelinek - Jan Hubicka - Jason Eckhardt - Jason Merrill - Jeff Law - Jeffrey Osier - Jeffrey Wheat - Jim Kingdon - Jim Wilson - John Gilmore - Jörn Rennecke - K. Richard Pixley - Ken Raeburn - Kung Hsu - Mark Eichin - Michael Meissner - Michael Tiemann - Mike Werner - Nick Clifton - Per Bothner - Peter Schauer - Richard Earnshaw - Richard Henderson - Richard Stallman - Rob Savoye - Roland H. Pesch - Sean Eric Fagan - Stan Shebs - Stephane Carrez - Steve Chamberlain - Stu Grossman - Torbjorn Granlund - Ulf Carlsson - -%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 @@ -273,29 +196,33 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" # 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 @@ ADDITIONAL_LD_TARGETS="x86_64-suse-linux" --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 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes 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 @@ make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" | 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 @@ TARGET_OS=%{TARGET}-linux %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 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : 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 @@ cd .. %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 @@ rm -rf $RPM_BUILD_ROOT %{_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@suse.de +- Adjust list of extra targets. * Mon Jan 19 2009 schwab@suse.de - Update to head of trunk. - Add gold. diff --git a/pre_checkin.sh b/pre_checkin.sh index 6915433..096f05e 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -8,7 +8,8 @@ for arch in hppa hppa64 mips arm i386 x86_64 s390 s390x sh4 ppc ppc64 ia64 sparc 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."