diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-19 23:15:04 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-19 23:15:04 +0000 |
| commit | eefecc8813e0c062a2058b33209cb30830f824b6 (patch) | |
| tree | f2dd237a65b4a8a3587da4cb6ac211ae6048911f /multilib/gcc-multilib | |
| parent | 3e2075427791725d8e6a007feba107d94c017caf (diff) | |
Thu Jan 19 23:15:03 UTC 2012
Diffstat (limited to 'multilib/gcc-multilib')
| -rw-r--r-- | multilib/gcc-multilib/PKGBUILD | 10 | ||||
| -rw-r--r-- | multilib/gcc-multilib/gcc_pure64-multilib.patch | 24 |
2 files changed, 29 insertions, 5 deletions
diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index fd906c6e5..f66432820 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61593 2012-01-04 01:24:16Z allan $ +# $Id: PKGBUILD 62202 2012-01-18 10:46:56Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,7 +8,7 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.6.2 -pkgrel=5 +pkgrel=5.1 _snapshot=4.6-20111223 _libstdcppmanver=20111215 pkgdesc="The GNU Compiler Collection for multilib" @@ -22,11 +22,11 @@ options=('!libtool' '!emptydirs') source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2 - gcc_pure64.patch + gcc_pure64-multilib.patch gcc-hash-style-both.patch) md5sums=('4755b9f6ac0abecbaa2097ed9738406a' '450772ce32daed97d7383199f8797f33' - '4030ee1c08dd1e843c0225b772360e76' + '7da5b7ab75b3c29993f953b18bc38579' '4df25b623799b148a0703eaeec8fdf3f') if [ -n "${_snapshot}" ]; then @@ -44,7 +44,7 @@ build() { # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - patch -Np1 -i ${srcdir}/gcc_pure64.patch + patch -Np1 -i ${srcdir}/gcc_pure64-multilib.patch patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch echo ${pkgver} > gcc/BASE-VER diff --git a/multilib/gcc-multilib/gcc_pure64-multilib.patch b/multilib/gcc-multilib/gcc_pure64-multilib.patch new file mode 100644 index 000000000..73df6b873 --- /dev/null +++ b/multilib/gcc-multilib/gcc_pure64-multilib.patch @@ -0,0 +1,24 @@ +diff -u -r gcc-4.6-20111223/gcc/config/i386/linux64.h gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h +--- gcc-4.6-20111223/gcc/config/i386/linux64.h 2011-09-08 11:12:35.000000000 +0200 ++++ gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h 2012-01-14 19:52:33.688573352 +0100 +@@ -63,7 +63,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #if TARGET_64BIT_DEFAULT + #define SPEC_32 "m32" +diff -u -r gcc-4.6-20111223/gcc/config/i386/t-linux64 gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64 +--- gcc-4.6-20111223/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200 ++++ gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64 2012-01-14 19:50:27.346242617 +0100 +@@ -25,7 +25,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib32 + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib |