From 0b35bb5a2335ac856a97859b71e71757a32b2b8c Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 4 Jun 2013 18:38:51 +0100 Subject: Backport some cleanups from the RHEL cross-compiler --- cross-binutils.spec | 87 +++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/cross-binutils.spec b/cross-binutils.spec index 20d00f0..d4ce67e 100644 --- a/cross-binutils.spec +++ b/cross-binutils.spec @@ -1,44 +1,44 @@ -%define build_all 1 -%define build_alpha %{build_all} -%define build_arm %{build_all} -%define build_aarch64 %{build_all} -%define build_avr32 %{build_all} -%define build_blackfin %{build_all} -%define build_c6x %{build_all} -%define build_cris %{build_all} -%define build_frv %{build_all} -%define build_h8300 %{build_all} -%define build_hppa64 %{build_all} -%define build_ia64 %{build_all} -%define build_m32r %{build_all} -%define build_m68k %{build_all} -%define build_microblaze %{build_all} -%define build_mips64 %{build_all} -%define build_mn10300 %{build_all} -%define build_openrisc %{build_all} -%define build_powerpc64 %{build_all} -%define build_s390x %{build_all} -%define build_score %{build_all} -%define build_sh %{build_all} -%define build_sh64 %{build_all} -%define build_sparc64 %{build_all} -%define build_tile %{build_all} -%define build_x86_64 %{build_all} -%define build_xtensa %{build_all} +%define build_all 1 +%define build_alpha %{build_all} +%define build_arm %{build_all} +%define build_aarch64 %{build_all} +%define build_avr32 %{build_all} +%define build_blackfin %{build_all} +%define build_c6x %{build_all} +%define build_cris %{build_all} +%define build_frv %{build_all} +%define build_h8300 %{build_all} +%define build_hppa64 %{build_all} +%define build_ia64 %{build_all} +%define build_m32r %{build_all} +%define build_m68k %{build_all} +%define build_microblaze %{build_all} +%define build_mips64 %{build_all} +%define build_mn10300 %{build_all} +%define build_openrisc %{build_all} +%define build_powerpc64 %{build_all} +%define build_s390x %{build_all} +%define build_score %{build_all} +%define build_sh %{build_all} +%define build_sh64 %{build_all} +%define build_sparc64 %{build_all} +%define build_tile %{build_all} +%define build_x86_64 %{build_all} +%define build_xtensa %{build_all} # 32-bit packages we don't build as we can use the 64-bit package instead -%define build_hppa 0 -%define build_i386 0 -%define build_mips 0 -%define build_powerpc 0 -%define build_s390 0 -%define build_sparc 0 -%define build_sh4 0 +%define build_hppa 0 +%define build_i386 0 +%define build_mips 0 +%define build_powerpc 0 +%define build_s390 0 +%define build_sparc 0 +%define build_sh4 0 # not available in binutils-2.22 -%define build_hexagon 0 -%define build_unicore32 0 +%define build_hexagon 0 +%define build_unicore32 0 Summary: A GNU collection of cross-compilation binary utilities Name: cross-binutils @@ -204,7 +204,7 @@ function prep_target () { target=$1 cond=$2 - if [ $cond = 1 ] + if [ $cond != 0 ] then echo $1 >&5 fi @@ -271,7 +271,7 @@ fi function config_target () { arch=$1 prefix=$arch- - build_dir=$arch + build_dir=${1%%%%-*} case $arch in arm-*) target=arm-linux-gnueabi;; @@ -364,8 +364,8 @@ do done function build_target () { - arch=$1 - make -C $arch %{_smp_mflags} tooldir=%{_prefix} all + build_dir=${1%%%%-*} + make -C $build_dir %{_smp_mflags} tooldir=%{_prefix} all } for target in `cat target.list` @@ -407,8 +407,8 @@ cd .. rm -rf %{buildroot} function install_bin () { - cross=$1 - make install -C $cross DESTDIR=%{buildroot} + build_dir=${1%%%%-*} + make install -C $build_dir DESTDIR=%{buildroot} } for target in `cat target.list` @@ -583,6 +583,9 @@ rm -rf %{buildroot} %do_files xtensa-linux-gnu %{build_xtensa} %changelog +* Tue Jun 4 2013 David Howells - 2.23.51.0.3-2 +- Backport cleanups from the RHEL-6.4 cross-compiler. + * Wed Feb 13 2013 Fedora Release Engineering - 2.23.51.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -- cgit