[cross-gcc] Backport cleanups from RHEL-6.4 cross-compiler
David Howells
dhowells at fedoraproject.org
Mon Aug 12 15:01:48 UTC 2013
commit e7775a88dd7cd70df670a7beafe304d38e8a7ac8
Author: David Howells <dhowells at redhat.com>
Date: Wed Jun 5 16:36:33 2013 +0100
Backport cleanups from RHEL-6.4 cross-compiler
cross-gcc.spec | 144 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 80 insertions(+), 64 deletions(-)
---
diff --git a/cross-gcc.spec b/cross-gcc.spec
index 2862878..8fc9264 100644
--- a/cross-gcc.spec
+++ b/cross-gcc.spec
@@ -1,49 +1,49 @@
-%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_mips64 %{build_all}
-%define build_mn10300 %{build_all}
-%define build_powerpc64 %{build_all}
-%define build_s390x %{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_mips64 %{build_all}
+%define build_mn10300 %{build_all}
+%define build_powerpc64 %{build_all}
+%define build_s390x %{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}
# gcc considers obsolete
-%define build_score 0
+%define build_score 0
# gcc doesn't build
-%define build_microblaze 0
+%define build_microblaze 0
# 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_sh4 0
-%define build_sparc 0
+%define build_hppa 0
+%define build_i386 0
+%define build_mips 0
+%define build_powerpc 0
+%define build_s390 0
+%define build_sh4 0
+%define build_sparc 0
# gcc doesn't support
-%define build_openrisc 0
+%define build_openrisc 0
# not available in binutils-2.22
-%define build_unicore32 0
+%define build_unicore32 0
%global multilib_64_archs sparc64 ppc64 s390x x86_64
@@ -308,9 +308,11 @@ fi
%build
function config_target () {
+ echo "=== CONFIGURING $1"
+
arch=$1
- cross=$arch-
- build_dir=$arch
+ prefix=$arch-
+ build_dir=$1
case $arch in
arm-*) target=arm-linux-gnueabi;;
@@ -377,39 +379,47 @@ function config_target () {
WINDMC_FOR_TARGET=%{_bindir}/$arch-windmc \
LDFLAGS='-Wl,-z,relro ' \
../%{srcdir}/configure \
+ --bindir=%{_bindir} \
+ --build=%{_target_platform} \
+ --datadir=%{_datadir} \
+ --disable-decimal-float \
--disable-dependency-tracking \
+ --disable-gold \
+ --disable-libgomp \
+ --disable-libmudflap \
+ --disable-libquadmath \
+ --disable-libssp \
+ --disable-nls \
+ --disable-plugin \
+ --disable-shared \
--disable-silent-rules \
- --prefix=%{_prefix} \
+ --disable-sjlj-exceptions \
+ --disable-threads \
+ --enable-checking=$checking \
+ --enable-gnu-unique-object \
+ --enable-languages=c \
+ --enable-linker-build-id \
+ --enable-nls \
+ --enable-obsolete \
+ --enable-targets=all \
--exec-prefix=%{_exec_prefix} \
- --bindir=%{_bindir} \
- --sbindir=%{_sbindir} \
- --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} \
+ --host=%{_target_platform} \
--includedir=%{_includedir} \
+ --infodir=%{_infodir} \
--libexecdir=%{_libexecdir} \
--localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
--mandir=%{_mandir} \
- --infodir=%{_infodir} \
- --build=%{_target_platform} \
- --host=%{_target_platform} \
+ --prefix=%{_prefix} \
+ --program-prefix=$prefix \
+ --sbindir=%{_sbindir} \
+ --sharedstatedir=%{_sharedstatedir} \
+ --sysconfdir=%{_sysconfdir} \
--target=$target \
- --enable-targets=all \
- --program-prefix=$cross \
- --enable-languages=c --with-newlib --without-headers \
- --disable-sjlj-exceptions --with-system-libunwind \
- --disable-nls --disable-threads --disable-shared \
- --disable-libmudflap --disable-libssp --disable-libgomp \
- --disable-libquadmath --disable-gold \
- --disable-decimal-float \
- --enable-checking=$checking \
- --enable-gnu-unique-object \
- --enable-linker-build-id \
- --disable-plugin \
- --enable-nls \
- --with-system-zlib \
--with-bugurl=http://bugzilla.redhat.com/bugzilla/ \
- --enable-obsolete \
+ --with-newlib \
+ --with-system-libunwind \
+ --with-system-zlib \
+ --without-headers \
$CONFIG_FLAGS
%if 0
--libdir=%{_libdir} # we want stuff in /usr/lib/gcc/ not /usr/lib64/gcc
@@ -424,7 +434,9 @@ do
done
function build_target () {
- arch=$1
+ echo "=== BUILDING $1"
+
+ build_dir=$1
AR_FOR_TARGET=%{_bindir}/$arch-ar \
AS_FOR_TARGET=%{_bindir}/$arch-as \
@@ -436,13 +448,13 @@ function build_target () {
STRIP_FOR_TARGET=%{_bindir}/$arch-strip \
WINDRES_FOR_TARGET=%{_bindir}/$arch-windres \
WINDMC_FOR_TARGET=%{_bindir}/$arch-windmc \
- make -C $target %{_smp_mflags} tooldir=%{_prefix} all-gcc
+ make -C $build_dir %{_smp_mflags} tooldir=%{_prefix} all-gcc
case $arch in
%{no_libgcc_targets})
;;
*)
- make -C $target %{_smp_mflags} tooldir=%{_prefix} all-target-libgcc
+ make -C $build_dir %{_smp_mflags} tooldir=%{_prefix} all-target-libgcc
;;
esac
@@ -454,6 +466,7 @@ do
done
# for documentation purposes only
+echo "=== CONFIGURING DOCUMENTATION"
mkdir stuff
cd stuff
@@ -501,6 +514,8 @@ cd ..
rm -rf %{buildroot}
function install_bin () {
+ echo "=== INSTALLING $1"
+
arch=$1
case $arch in
@@ -671,6 +686,7 @@ rm -rf %{buildroot}
%changelog
* Wed Jun 5 2013 David Howells <dhowells at redhat.com> - 4.7.2-2.aa.20121114svn.2
- Use CONFIG_FLAGS and ditch COPT to avoid confusion.
+- Backport cleanups from the RHEL-6.4 cross-compiler.
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.7.2-2.aa.20121114svn.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list