Mercurial > hg > aboriginal
changeset 1079:ce7cc07f44b3
Fix alt-gcc build and remove alt-patches for gcc and binutils.
author | Rob Landley <rob@landley.net> |
---|---|
date | Fri, 14 May 2010 04:26:34 -0500 |
parents | e81a9b8b3b93 |
children | 119367910fcd |
files | sources/patches/alt-binutils-2.18-screwinfo.patch sources/patches/alt-gcc-core-softfloat-fix.patch sources/sections/gcc.sh |
diffstat | 3 files changed, 2 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/sources/patches/alt-binutils-2.18-screwinfo.patch Fri May 14 04:19:58 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -The binutils build notices that makeinfo is missing, but fails anyway, breaking -the build. Make it stop. - -The "info" file format is obsolete (similar to "gopher"), was never used -by anyone but the FSF, and failed to even replace man pages (which are -now available in HTML). - ---- binutils-2.18/missing 2005-07-13 20:24:56.000000000 -0500 -+++ binutils-2.18/missing 2008-08-11 02:05:47.000000000 -0500 -@@ -299,7 +299,7 @@ - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. -- test -f $file || exit 1 -+# test -f $file || exit 1 - touch $file - ;; -
--- a/sources/patches/alt-gcc-core-softfloat-fix.patch Fri May 14 04:19:58 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -diff -ru gcc.bak/gcc/config.gcc gcc-4.1.2/gcc/config.gcc ---- gcc.bak/gcc/config.gcc 2006-10-15 19:12:23.000000000 -0400 -+++ gcc-4.1.2/gcc/config.gcc 2007-07-04 21:07:42.000000000 -0400 -@@ -685,7 +685,7 @@ - default_use_cxa_atexit=yes - ;; - *) -- tmake_file="$tmake_file arm/t-linux" -+ tmake_file="$tmake_file arm/t-linux arm/t-arm-elf" - ;; - esac - tm_file="$tm_file arm/aout.h arm/arm.h" -diff -ru gcc.bak/gcc/config/arm/linux-elf.h gcc-4.1.2/gcc/config/arm/linux-elf.h ---- gcc.bak/gcc/config/arm/linux-elf.h 2005-10-09 21:04:31.000000000 -0400 -+++ gcc-4.1.2/gcc/config/arm/linux-elf.h 2007-07-04 21:07:42.000000000 -0400 -@@ -49,7 +49,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.2" -
--- a/sources/sections/gcc.sh Fri May 14 04:19:58 2010 -0500 +++ b/sources/sections/gcc.sh Fri May 14 04:26:34 2010 -0500 @@ -127,5 +127,6 @@ rm -rf "${STAGE_DIR}"/{lib/gcc,libexec/gcc/install-tools,bin/${ARCH}-unknown-*} -mv "$WORK"/{gcc-core,gcc} +# Little dance so binary package tarball would be called "gcc", not "gcc-core". +mv "$WORK"/{*gcc-core,gcc} PACKAGE=gcc cleanup build-gcc