From 5afac475fd5baf00593115e2d495038e23aa7cdf0a6c0fade7e3e8d3e0dd3e0a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 11 Jan 2011 13:41:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=36 --- binutils.spec | 65 +++++++----------- cross-alpha-binutils.spec | 49 ++++++-------- cross-arm-binutils.spec | 49 ++++++-------- cross-hppa-binutils.spec | 49 ++++++-------- cross-hppa64-binutils.spec | 49 ++++++-------- cross-i386-binutils.spec | 49 ++++++-------- cross-ia64-binutils.spec | 49 ++++++-------- cross-mips-binutils.spec | 49 ++++++-------- cross-ppc-binutils.spec | 49 ++++++-------- cross-ppc64-binutils.spec | 49 ++++++-------- cross-s390-binutils.spec | 49 ++++++-------- cross-s390x-binutils.spec | 49 ++++++-------- cross-sh4-binutils.spec | 49 ++++++-------- cross-sparc-binutils.spec | 49 ++++++-------- cross-spu-binutils.spec | 49 ++++++-------- cross-x86_64-binutils.spec | 49 ++++++-------- enable-targets-gold.diff | 12 ++++ enable-targets.diff | 134 ------------------------------------- 18 files changed, 321 insertions(+), 625 deletions(-) create mode 100644 enable-targets-gold.diff delete mode 100644 enable-targets.diff diff --git a/binutils.spec b/binutils.spec index 779c753..8ff4639 100644 --- a/binutils.spec +++ b/binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -312,31 +312,26 @@ echo "Building native binutils." %if %build_multitarget EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)" EXTRA_TARGETS="$EXTRA_TARGETS,powerpc-macos,powerpc-macos10,spu-elf" -%if !%{test_vanilla} -EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" -%endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} --libdir=%{_libdir} \\\ @@ -344,41 +339,25 @@ EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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#,}"} + --with-pic --build=%{HOST} mkdir build-dir cd build-dir -../configure %common_flags %extra_ld_targets --enable-shared +../configure %common_flags \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins --enable-shared \ +%ifarch %gold_archs + --enable-gold +%endif make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -%ifarch %gold_archs -mkdir ../build-dir2 -cd ../build-dir2 -../configure --disable-ld-targets %common_flags %extra_gold_targets \ - --enable-shared --enable-gold --program-prefix=go --enable-plugins -make %{?_smp_mflags} all-opcodes -make %{?_smp_mflags} all -%endif -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 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 # # @@ -447,15 +426,16 @@ 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 +ln -sf gold $RPM_BUILD_ROOT%{_bindir}/ld.gold %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 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir +if test -f $RPM_BUILD_ROOT%{_bindir}/ld.bfd; then + rm $RPM_BUILD_ROOT%{_bindir}/ld + ln -sf ld $RPM_BUILD_ROOT%{_bindir}/ld.bfd; +fi rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin @@ -470,6 +450,7 @@ chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 @@ -531,6 +512,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %ifarch %gold_archs %exclude %{_bindir}/gold +%exclude %{_bindir}/ld.gold %endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so @@ -544,6 +526,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc gold/NEWS gold/README %{_bindir}/gold +%{_bindir}/ld.gold %endif %files devel diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec index ac86225..d8d3b3d 100644 --- a/cross-alpha-binutils.spec +++ b/cross-alpha-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec index e252f11..e0efed8 100644 --- a/cross-arm-binutils.spec +++ b/cross-arm-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec index 49f81e7..d31db1b 100644 --- a/cross-hppa-binutils.spec +++ b/cross-hppa-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec index 71e644d..b6c7749 100644 --- a/cross-hppa64-binutils.spec +++ b/cross-hppa64-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec index d50ed93..ab480ae 100644 --- a/cross-i386-binutils.spec +++ b/cross-i386-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec index bd7f778..0c579fe 100644 --- a/cross-ia64-binutils.spec +++ b/cross-ia64-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec index 0ffae3a..25a3f6d 100644 --- a/cross-mips-binutils.spec +++ b/cross-mips-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec index da2f3d1..ace5a29 100644 --- a/cross-ppc-binutils.spec +++ b/cross-ppc-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec index 9dd255f..e40054d 100644 --- a/cross-ppc64-binutils.spec +++ b/cross-ppc64-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec index c4e030c..ab31150 100644 --- a/cross-s390-binutils.spec +++ b/cross-s390-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec index 0f545fe..6703952 100644 --- a/cross-s390x-binutils.spec +++ b/cross-s390x-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-sh4-binutils.spec b/cross-sh4-binutils.spec index 63b4269..52fe0d0 100644 --- a/cross-sh4-binutils.spec +++ b/cross-sh4-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec index e290f6e..7a7de2a 100644 --- a/cross-sparc-binutils.spec +++ b/cross-sparc-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec index 4367fb4..a995779 100644 --- a/cross-spu-binutils.spec +++ b/cross-spu-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec index 9425056..a80b6ca 100644 --- a/cross-x86_64-binutils.spec +++ b/cross-x86_64-binutils.spec @@ -79,7 +79,7 @@ Patch6: unit-at-a-time.patch Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: enable-targets.diff +Patch10: enable-targets-gold.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff @@ -289,50 +289,41 @@ EXTRA_TARGETS="$EXTRA_TARGETS,i386-macos10" %endif %else EXTRA_TARGETS= -%endif -EXTRA_LD_TARGETS= %ifarch sparc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,sparc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,sparc64-suse-linux" %endif %ifarch ppc -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,powerpc64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,powerpc64-suse-linux" %endif %ifarch s390 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390x-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390x-suse-linux" %endif %ifarch s390x -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,s390-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,s390-suse-linux" %endif %ifarch %ix86 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,x86_64-suse-linux" +EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux" %endif -EXTRA_GOLD_TARGETS=$EXTRA_LD_TARGETS %ifarch ppc ppc64 -EXTRA_LD_TARGETS="$EXTRA_LD_TARGETS,spu-elf" +EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf" +%endif %endif -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ - --prefix=%{_prefix} --libdir=%{_libdir} \\\ - --infodir=%{_infodir} --mandir=%{_mandir} \\\ - --with-bugurl=http://bugs.opensuse.org/ \\\ - --with-pkgversion="GNU Binutils; %{DIST}" \\\ - --with-separate-debug-dir=%{_prefix}/lib/debug \\\ - --with-pic --build=%{HOST} \\\ - ${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 %extra_ld_targets --enable-shared +../configure \ + CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \ + --prefix=%{_prefix} --libdir=%{_libdir} \ + --infodir=%{_infodir} --mandir=%{_mandir} \ + --with-bugurl=http://bugs.opensuse.org/ \ + --with-pkgversion="GNU Binutils; %{DIST}" \ + --with-separate-debug-dir=%{_prefix}/lib/debug \ + --with-pic --build=%{HOST} \ + ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} \ + --enable-plugins \ make %{?_smp_mflags} all-bfd TARGET-bfd=headers -# force reconfiguring +# force reconfiguring (???) rm bfd/Makefile make %{?_smp_mflags} -mkdir ../build-dir3 -cd ../build-dir3 -../configure %common_flags --disable-shared -make %{?_smp_mflags} all-bfd all-opcodes %check export SUSE_ASNEEDED=0 @@ -408,9 +399,7 @@ cd build-dir # installing native binutils make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -cd ../build-dir3 make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd ../build-dir rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin diff --git a/enable-targets-gold.diff b/enable-targets-gold.diff new file mode 100644 index 0000000..cfba63b --- /dev/null +++ b/enable-targets-gold.diff @@ -0,0 +1,12 @@ +--- gold/configure.orig 2011-01-11 12:22:06.000000000 +0100 ++++ gold/configure 2011-01-11 12:23:38.000000000 +0100 +@@ -3389,7 +3389,8 @@ + . ${srcdir}/configure.tgt + + if test "$targ_obj" = "UNKNOWN"; then +- as_fn_error "\"unsupported target $targ\"" "$LINENO" 5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"unsupported target $targ\"" >&5 ++$as_echo "$as_me: WARNING: \"unsupported target $targ\"" >&2;} + else + targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)" + if test "$targ_extra_obj" != ""; then diff --git a/enable-targets.diff b/enable-targets.diff deleted file mode 100644 index 01e04cd..0000000 --- a/enable-targets.diff +++ /dev/null @@ -1,134 +0,0 @@ -Index: gold/configure -=================================================================== ---- gold/configure.orig 2010-11-23 14:50:32.000000000 +0100 -+++ gold/configure 2011-01-10 18:04:44.000000000 +0100 -@@ -770,6 +770,7 @@ enable_gold - enable_threads - enable_plugins - enable_targets -+enable_ld_targets - enable_dependency_tracking - enable_nls - enable_werror -@@ -1416,6 +1417,7 @@ Optional Features: - --enable-threads multi-threaded linking - --enable-plugins linker plugins - --enable-targets alternative target configurations -+ --enable-ld-targets alternative target configurations - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --disable-nls do not use Native Language Support -@@ -3354,9 +3356,29 @@ else - fi - - -+# Check whether --enable-ld-targets was given. -+if test "${enable_ld_targets+set}" = set; then : -+ enableval=$enable_ld_targets; case "${enableval}" in -+ yes | "") -+ as_fn_error "--enable-ld-targets option must specify target names or 'all'" "$LINENO" 5 -+ ;; -+ no) -+ enable_ld_targets= -+ ;; -+ *) -+ enable_ld_targets=$enableval -+ ;; -+esac -+else -+ # For now, enable all targets by default -+ enable_ld_targets=$enable_targets -+ -+fi -+ -+ - # Canonicalize the enabled targets. --if test -n "$enable_targets"; then -- for targ in `echo $enable_targets | sed -e 's/,/ /g'`; do -+if test -n "$enable_ld_targets"; then -+ for targ in `echo $enable_ld_targets | sed -e 's/,/ /g'`; do - result=`$ac_config_sub $targ 2>/dev/null` - if test -n "$result"; then - canon_targets="$canon_targets $result" -Index: gold/configure.ac -=================================================================== ---- gold/configure.ac.orig 2010-11-23 14:50:32.000000000 +0100 -+++ gold/configure.ac 2011-01-10 18:04:44.000000000 +0100 -@@ -117,9 +117,26 @@ esac], - enable_targets=all - ]) - -+AC_ARG_ENABLE([ld-targets], -+[ --enable-ld-targets alternative target configurations], -+[case "${enableval}" in -+ yes | "") -+ AC_MSG_ERROR([--enable-ld-targets option must specify target names or 'all']) -+ ;; -+ no) -+ enable_ld_targets= -+ ;; -+ *) -+ enable_ld_targets=$enableval -+ ;; -+esac], -+[# For now, enable all targets by default -+ enable_ld_targets=$enable_targets -+]) -+ - # Canonicalize the enabled targets. --if test -n "$enable_targets"; then -- for targ in `echo $enable_targets | sed -e 's/,/ /g'`; do -+if test -n "$enable_ld_targets"; then -+ for targ in `echo $enable_ld_targets | sed -e 's/,/ /g'`; do - result=`$ac_config_sub $targ 2>/dev/null` - if test -n "$result"; then - canon_targets="$canon_targets $result" -Index: ld/configure -=================================================================== ---- ld/configure.orig 2010-11-23 14:50:32.000000000 +0100 -+++ ld/configure 2011-01-10 18:04:44.000000000 +0100 -@@ -1413,6 +1413,7 @@ Optional Features: - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-targets alternative target configurations -+ --enable-ld-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, -@@ -13155,7 +13156,7 @@ all_libpath= - - rm -f tdirs - --for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'` -+for targ_alias in `echo $target_alias $enable_ld_targets | sed 's/,/ /g'` - do - if test "$targ_alias" = "all"; then - all_targets=true -Index: ld/configure.in -=================================================================== ---- ld/configure.in.orig 2010-11-23 14:50:32.000000000 +0100 -+++ ld/configure.in 2011-01-10 18:04:44.000000000 +0100 -@@ -22,6 +22,14 @@ AC_ARG_ENABLE(targets, - no) enable_targets= ;; - *) enable_targets=$enableval ;; - esac])dnl -+AC_ARG_ENABLE(ld-targets, -+[ --enable-ld-targets alternative target configurations], -+[case "${enableval}" in -+ yes | "") AC_ERROR(enable-ld-targets option must specify target names or 'all') -+ ;; -+ no) enable_ld_targets= ;; -+ *) enable_ld_targets=$enableval ;; -+esac], [enable_ld_targets=$enable_targets])dnl - AC_ARG_ENABLE(64-bit-bfd, - [ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)], - [case "${enableval}" in -@@ -226,7 +234,7 @@ dnl not permit literal newlines in an AC - dnl file. - rm -f tdirs - --for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'` -+for targ_alias in `echo $target_alias $enable_ld_targets | sed 's/,/ /g'` - do - if test "$targ_alias" = "all"; then - all_targets=true