diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.8.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc index 3219e0c25b..dafa2415ec 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8.inc +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc | |||
@@ -69,6 +69,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ | |||
69 | file://0037-gcc-4.8-PR56797.patch \ | 69 | file://0037-gcc-4.8-PR56797.patch \ |
70 | file://0038-gcc-4.8-build-args.patch \ | 70 | file://0038-gcc-4.8-build-args.patch \ |
71 | file://0039-gcc-4.8-PR57717.patch \ | 71 | file://0039-gcc-4.8-PR57717.patch \ |
72 | file://0040-fix-g++-sysroot.patch \ | ||
72 | " | 73 | " |
73 | SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304" | 74 | SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304" |
74 | SRC_URI[sha256sum] = "545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813" | 75 | SRC_URI[sha256sum] = "545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813" |
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch b/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch new file mode 100644 index 0000000000..d50aa5c9bc --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Portions of | ||
2 | |||
3 | http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html | ||
4 | |||
5 | are not upstreamed yet. So lets keep missing pieces. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Index: gcc-4.8.1/gcc/configure.ac | ||
12 | =================================================================== | ||
13 | --- gcc-4.8.1.orig/gcc/configure.ac 2013-07-15 15:55:49.488399132 -0700 | ||
14 | +++ gcc-4.8.1/gcc/configure.ac 2013-07-15 16:02:31.772406679 -0700 | ||
15 | @@ -148,7 +148,9 @@ | ||
16 | if test "${with_sysroot+set}" = set; then | ||
17 | gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` | ||
18 | if test "${gcc_gxx_without_sysroot}"; then | ||
19 | - gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
20 | + if test x${with_sysroot} != x/; then | ||
21 | + gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
22 | + fi | ||
23 | gcc_gxx_include_dir_add_sysroot=1 | ||
24 | fi | ||
25 | fi | ||
26 | Index: gcc-4.8.1/gcc/configure | ||
27 | =================================================================== | ||
28 | --- gcc-4.8.1.orig/gcc/configure 2013-07-15 15:55:49.472399132 -0700 | ||
29 | +++ gcc-4.8.1/gcc/configure 2013-07-15 16:02:31.780406680 -0700 | ||
30 | @@ -3325,7 +3325,9 @@ | ||
31 | if test "${with_sysroot+set}" = set; then | ||
32 | gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` | ||
33 | if test "${gcc_gxx_without_sysroot}"; then | ||
34 | - gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
35 | + if test x${with_sysroot} != x/; then | ||
36 | + gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
37 | + fi | ||
38 | gcc_gxx_include_dir_add_sysroot=1 | ||
39 | fi | ||
40 | fi | ||