diff options
| author | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-04-27 17:47:41 +0200 |
|---|---|---|
| committer | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-04-27 17:47:41 +0200 |
| commit | 691fd364dc741a8df339a1c3f74d941589ebaa99 (patch) | |
| tree | 17aca55ad50553f58defacb24c377cd8777cf966 /recipes/gcc/gcc-4.4.0/debian/gcc-multilib64dir.dpatch | |
| parent | 413cc98aa563c9e6104d1104d5b24987ab9d12f8 (diff) | |
| parent | eee57a831f63162a5c40c7ed53805f8d78a058bf (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/gcc/gcc-4.4.0/debian/gcc-multilib64dir.dpatch')
| -rw-r--r-- | recipes/gcc/gcc-4.4.0/debian/gcc-multilib64dir.dpatch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/recipes/gcc/gcc-4.4.0/debian/gcc-multilib64dir.dpatch b/recipes/gcc/gcc-4.4.0/debian/gcc-multilib64dir.dpatch new file mode 100644 index 0000000000..fe8f5a1a41 --- /dev/null +++ b/recipes/gcc/gcc-4.4.0/debian/gcc-multilib64dir.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh -e + +# DP: Use lib instead of lib64 as multilibdir on amd64 and ppc64. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +Index: gcc/config/i386/t-linux64 +=================================================================== +--- gcc/config/i386/t-linux64 (revision 130706) ++++ gcc/config/i386/t-linux64 (working copy) +@@ -13,7 +13,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 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib +Index: gcc/config/rs6000/t-linux64 +=================================================================== +--- gcc/config/rs6000/t-linux64 (revision 130706) ++++ gcc/config/rs6000/t-linux64 (working copy) +@@ -14,13 +14,13 @@ + # it doesn't tell anything about the 32bit libraries on those systems. Set + # MULTILIB_OSDIRNAMES according to what is found on the target. + +-MULTILIB_OPTIONS = m64/m32 msoft-float +-MULTILIB_DIRNAMES = 64 32 nof ++MULTILIB_OPTIONS = m64/m32 ++MULTILIB_DIRNAMES = 64 32 + MULTILIB_EXTRA_OPTS = fPIC mstrict-align +-MULTILIB_EXCEPTIONS = m64/msoft-float +-MULTILIB_EXCLUSIONS = m64/!m32/msoft-float +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof +-MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) ++MULTILIB_EXCEPTIONS = ++MULTILIB_EXCLUSIONS = ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_MATCHES = + + softfp_wrap_start := '\#ifndef __powerpc64__' + softfp_wrap_end := '\#endif' |