Prechádzať zdrojové kódy

use libc specific patching to avoid any side effects in the gcc patches, as seen in buildroot recently

Waldemar Brodkorb 10 rokov pred
rodič
commit
c62fce6742

+ 2 - 2
mk/buildhlp.mk

@@ -75,9 +75,9 @@ ifeq ($(strip ${__use_generic_patch_target}),42)
 post-patch:
 ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done
 	[ ! -d ./patches/${PKG_VERSION} ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches/${PKG_VERSION} \
-	    '{patch-!(*.orig),*.patch,*.${ADK_TARGET_ARCH}}' $(MAKE_TRACE)
+	    '{patch-!(*.orig),*.patch,*.${ADK_TARGET_ARCH},*.${ADK_TARGET_LIBC}}' $(MAKE_TRACE)
 	[ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \
-	    '{patch-!(*.orig),*.patch,*.${ADK_TARGET_ARCH}}' $(MAKE_TRACE)
+	    '{patch-!(*.orig),*.patch,*.${ADK_TARGET_ARCH},*.${ADK_TARGET_LIBC}}' $(MAKE_TRACE)
 	[ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \
 		$(MAKE_TRACE)
 	@${MAKE} post-patch $(MAKE_TRACE)

+ 0 - 0
package/gcc/patches/4.8.3/musl-cross.patch → package/gcc/patches/4.8.3/gcc.musl


+ 0 - 49
package/gcc/patches/4.8.3/musl-stubs.patch

@@ -1,49 +0,0 @@
-diff -Nur gcc-4.8.2.orig/gcc/config/m68k/linux.h gcc-4.8.2/gcc/config/m68k/linux.h
---- gcc-4.8.2.orig/gcc/config/m68k/linux.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.2/gcc/config/m68k/linux.h	2014-02-24 10:19:00.214399704 +0100
-@@ -72,6 +72,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-m68k.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Nur gcc-4.8.2.orig/gcc/config/mips/linux64.h gcc-4.8.2/gcc/config/mips/linux64.h
---- gcc-4.8.2.orig/gcc/config/mips/linux64.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.2/gcc/config/mips/linux64.h	2014-02-24 10:19:47.238583895 +0100
-@@ -27,6 +27,9 @@
- #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
-+#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
--			 BIONIC_DYNAMIC_LINKERN32)
-+			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
-diff -Nur gcc-4.8.2.orig/gcc/config/sparc/linux64.h gcc-4.8.2/gcc/config/sparc/linux64.h
---- gcc-4.8.2.orig/gcc/config/sparc/linux64.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.2/gcc/config/sparc/linux64.h	2014-02-24 10:20:49.414827006 +0100
-@@ -94,6 +94,9 @@
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1"
-+
- 
- #ifdef SPARC_BI_ARCH
- 
-diff -Nur gcc-4.8.2.orig/gcc/config/sparc/linux.h gcc-4.8.2/gcc/config/sparc/linux.h
---- gcc-4.8.2.orig/gcc/config/sparc/linux.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.2/gcc/config/sparc/linux.h	2014-02-24 10:21:14.342924339 +0100
-@@ -84,6 +84,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sparc.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \

+ 0 - 0
toolchain/gcc/patches/4.8.3/musl-cross.patch → toolchain/gcc/patches/4.8.3/gcc.musl


+ 0 - 60
toolchain/gcc/patches/4.8.3/musl-stubs.patch

@@ -1,60 +0,0 @@
-diff -Nur gcc-4.8.3.orig/gcc/config/m68k/linux.h gcc-4.8.3/gcc/config/m68k/linux.h
---- gcc-4.8.3.orig/gcc/config/m68k/linux.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.3/gcc/config/m68k/linux.h	2014-06-01 08:57:42.139913658 +0200
-@@ -72,6 +72,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-m68k.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Nur gcc-4.8.3.orig/gcc/config/mips/linux64.h gcc-4.8.3/gcc/config/mips/linux64.h
---- gcc-4.8.3.orig/gcc/config/mips/linux64.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.3/gcc/config/mips/linux64.h	2014-06-01 08:57:42.139913658 +0200
-@@ -27,6 +27,9 @@
- #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
-+#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
--			 BIONIC_DYNAMIC_LINKERN32)
-+			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
-diff -Nur gcc-4.8.3.orig/gcc/config/sparc/linux64.h gcc-4.8.3/gcc/config/sparc/linux64.h
---- gcc-4.8.3.orig/gcc/config/sparc/linux64.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.3/gcc/config/sparc/linux64.h	2014-06-01 08:57:42.139913658 +0200
-@@ -94,6 +94,9 @@
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1"
-+
- 
- #ifdef SPARC_BI_ARCH
- 
-diff -Nur gcc-4.8.3.orig/gcc/config/sparc/linux.h gcc-4.8.3/gcc/config/sparc/linux.h
---- gcc-4.8.3.orig/gcc/config/sparc/linux.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.3/gcc/config/sparc/linux.h	2014-06-01 08:57:42.139913658 +0200
-@@ -84,6 +84,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sparc.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-diff -Nur gcc-4.8.3.orig/gcc/config/xtensa/linux.h gcc-4.8.3/gcc/config/xtensa/linux.h
---- gcc-4.8.3.orig/gcc/config/xtensa/linux.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.3/gcc/config/xtensa/linux.h	2014-06-01 08:58:39.740070402 +0200
-@@ -45,6 +45,7 @@
-   %{mno-longcalls:--no-longcalls}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-xtensa.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC \