From: Victor Martinez Date: Tue, 17 May 2016 11:45:18 +0000 (+0000) Subject: gcc: removed multilib patch X-Git-Url: http://gitweb/?a=commitdiff_plain;h=c95d3400a9c7cbd4b9dc1a115b847ab5671d8d54;p=crossrootfs.git gcc: removed multilib patch --- diff --git a/gcc/.md5sum b/gcc/.md5sum index 6ae031c..1780eb5 100644 --- a/gcc/.md5sum +++ b/gcc/.md5sum @@ -1,3 +1,2 @@ -61a057afa31006764b957a483ba90b9d gcc-5.3.0-multilib-dirs.patch c9616fd448f980259c31de613e575719 gcc-5.3.0.tar.bz2 a617c4d3fa11e0c9410ac213eb061677 gcc-nocheck-fixincludes.patch diff --git a/gcc/Pkgfile b/gcc/Pkgfile index b70a2d7..8bddd47 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -8,11 +8,10 @@ name=gcc version=5.3.0 release=1 source=(ftp://gcc.gnu.org/pub/gcc/releases/$name-$version/$name-$version.tar.bz2 - $name-nocheck-fixincludes.patch gcc-$version-multilib-dirs.patch) + $name-nocheck-fixincludes.patch) build() { patch -d $name-$version -p1 -i $SRC/$name-nocheck-fixincludes.patch - patch -d $name-$version -p1 -i $SRC/$name-$version-multilib-dirs.patch cd $name-$version sed -i 's|REVISION|REVISION " (CRUX-ARM 64b)"|' $name/version.c diff --git a/gcc/gcc-5.3.0-multilib-dirs.patch b/gcc/gcc-5.3.0-multilib-dirs.patch deleted file mode 100644 index 014919f..0000000 --- a/gcc/gcc-5.3.0-multilib-dirs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nru gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/linux64.h ---- gcc-4.7.3.orig/gcc/config/i386/linux64.h 2013-04-13 18:33:41.015109554 +0200 -+++ gcc-4.7.3/gcc/config/i386/linux64.h 2013-04-13 18:34:01.147713013 +0200 -@@ -28,6 +28,6 @@ - #define GNU_USER_LINK_EMULATION64 "elf_x86_64" - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -diff -Nru gcc-4.7.3.orig/gcc/config/i386/t-linux64 gcc-4.7.3/gcc/config/i386/t-linux64 ---- gcc-4.7.3.orig/gcc/config/i386/t-linux64 2013-04-13 18:33:41.015109554 +0200 -+++ gcc-4.7.3/gcc/config/i386/t-linux64 2013-04-13 18:39:13.269752565 +0200 -@@ -34,6 +34,6 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) -+MULTILIB_OSDIRNAMES = m64=../lib$(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+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)