aboutsummaryrefslogtreecommitdiffstats
path: root/main/gcc/gcc-pure64.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-04-22 06:35:50 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-04-22 08:16:14 +0000
commite22c381bb9c5f14bbd59f316b63b136a7bb841be (patch)
treef29089019ac6b2f0500704f5a8acc146d75308a2 /main/gcc/gcc-pure64.patch
parent815a3b428027155ace6f04dc6e088c0a87acf062 (diff)
downloadaports-e22c381bb9c5f14bbd59f316b63b136a7bb841be.tar.bz2
aports-e22c381bb9c5f14bbd59f316b63b136a7bb841be.tar.xz
main/gcc: upgrade to 4.7.3 and clean up subpkg deps
also fix gcc-objc subpackage
Diffstat (limited to 'main/gcc/gcc-pure64.patch')
-rw-r--r--main/gcc/gcc-pure64.patch15
1 files changed, 6 insertions, 9 deletions
diff --git a/main/gcc/gcc-pure64.patch b/main/gcc/gcc-pure64.patch
index 392aa56957..6ff4cdc5e9 100644
--- a/main/gcc/gcc-pure64.patch
+++ b/main/gcc/gcc-pure64.patch
@@ -1,14 +1,11 @@
-diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
---- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000
-@@ -34,8 +34,8 @@
+--- ./gcc/config/i386/t-linux64.orig 2013-01-14 16:32:37.000000000 +0000
++++ ./gcc/config/i386/t-linux64 2013-04-22 06:12:32.984439677 +0000
+@@ -34,6 +34,6 @@
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
+MULTILIB_OSDIRNAMES = m64=../lib
+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
-
- LIBGCC = stmp-multilib
+ MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)