summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-07-01 13:27:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-08 09:57:25 +0100
commit14c90118287a1be1766f92410c2b14f6b72b7a57 (patch)
tree2ab435aa45cdb8436edba63cd9602edf44553e1d /meta
parent7b6f66777e00c93b11691c99372efefa0c80f303 (diff)
downloadpoky-14c90118287a1be1766f92410c2b14f6b72b7a57.tar.gz
gcc: remove unused patch
(From OE-Core rev: 8833e419e898d741900be3f03f8d8d4ef123aa1a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/0001-gcc-runtime-Symlink-c-header-in-target_triplet-for-S.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-devtools/gcc/0001-gcc-runtime-Symlink-c-header-in-target_triplet-for-S.patch b/meta/recipes-devtools/gcc/0001-gcc-runtime-Symlink-c-header-in-target_triplet-for-S.patch
deleted file mode 100644
index c598a0d6f7..0000000000
--- a/meta/recipes-devtools/gcc/0001-gcc-runtime-Symlink-c-header-in-target_triplet-for-S.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 0ef3d75514ee5a74b7c04ea36423cff97843fbb8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 10 May 2016 01:07:24 -0700
4Subject: [PATCH] gcc-runtime: Symlink c++ header in target_triplet for SDK use
5
6We build SDKs such that gcc-cross-candian is built for only one
7target *-*-linux and then use -muclibc or -mmusl to let it compile
8code for other libc variants. This works fine when libc = glibc
9however it does not work for c++ programs when libc != glibc since
10there are c++ headers installed under ${includedir}/c++/${BINV}/${TARGET_SYS}
11which is fine when gcc-runtime and gcc-cross-candian uses same --target options
12gxx includedir searches in right triplet, but it fails with musl/uclibc
13since gcc will look for glibc based triplet but gcc-runtime will install
14them under musl/uclibc triplet.
15
16This patch symlinks the musl/uclibc triplet to glibc triplet when libc != glibc
17
18This fixes SDKs for musl/uclibc
19
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21---
22 meta/recipes-devtools/gcc/gcc-runtime.inc | 6 ++++--
23 1 file changed, 4 insertions(+), 2 deletions(-)
24
25diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
26index 8639c1c..8e4d5eb 100644
27--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
28+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
29@@ -70,13 +70,15 @@ do_install () {
30 if [ -d ${D}${infodir} ]; then
31 rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
32 fi
33+}
34+
35+do_install_append_class-target () {
36 if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
37 ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
38 fi
39- if [ "${TARGET_OS}" = "linux-gnuspe" ]; then
40+ if [ "${TARGET_OS}" = "linux-gnuspe" -o "${TCLIBC}" != "glibc" ]; then
41 ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
42 fi
43- chown -R root:root ${D}
44 }
45
46 INHIBIT_DEFAULT_DEPS = "1"
47--
482.8.2
49