summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc17
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc15
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_4.6.bb2
4 files changed, 18 insertions, 17 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 4bbb2d22dc..a76fa0b4ce 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -73,6 +73,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
73 file://pr47551.patch \ 73 file://pr47551.patch \
74 file://gcc-arm-set-cost.patch \ 74 file://gcc-arm-set-cost.patch \
75 file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \ 75 file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
76 file://fortran-cross-compile-hack.patch \
76 " 77 "
77 78
78SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch " 79SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index fe112d9d0a..ed41b0ff8a 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -88,3 +88,20 @@ python workshared_clean () {
88 bb.note("Removing " + dir) 88 bb.note("Removing " + dir)
89 oe.path.remove(dir) 89 oe.path.remove(dir)
90} 90}
91
92do_headerfix () {
93 # Change the default dynamic linker path, in case $base_liddir is non-standard
94 # (e.g. in multilib or sdk cases)
95 #
96 # We want something like the following:
97 # #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
98 # becomes
99 # #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
100 #
101 sed -i ${S}/gcc/config/*/linux*.h -e \
102 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\) \( *"/lib.*\)/\(.*\)#\1 SYSTEMLIBS_DIR "\3#'
103}
104
105addtask headerfix after do_unpack before do_patch
106
107do_headerfix[vardepvalue] = "PATH"
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index d0149801db..c4b6ac1111 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -62,21 +62,6 @@ SYSTEMHEADERS = "${target_includedir}"
62SYSTEMLIBS = "${target_base_libdir}/" 62SYSTEMLIBS = "${target_base_libdir}/"
63SYSTEMLIBS1 = "${target_libdir}/" 63SYSTEMLIBS1 = "${target_libdir}/"
64 64
65do_headerfix () {
66 # Change the default dynamic linker path, in case $base_liddir is non-standard
67 # (e.g. in multilib or sdk cases)
68 #
69 # We want something like the following:
70 # #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
71 # becomes
72 # #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
73 #
74 sed -i ${S}/gcc/config/*/linux*.h -e \
75 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\) \( *"/lib.*\)/\(.*\)#\1 SYSTEMLIBS_DIR "\3#'
76}
77
78addtask headerfix after do_unpack before do_patch
79
80do_configure_prepend () { 65do_configure_prepend () {
81 # teach gcc to find correct target includedir when checking libc ssp support 66 # teach gcc to find correct target includedir when checking libc ssp support
82 mkdir -p ${B}/gcc 67 mkdir -p ${B}/gcc
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
index 568b5afaa9..97468db29f 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
@@ -2,8 +2,6 @@ require gcc-${PV}.inc
2require gcc-configure-runtime.inc 2require gcc-configure-runtime.inc
3require gcc-package-runtime.inc 3require gcc-package-runtime.inc
4 4
5SRC_URI_append = "file://fortran-cross-compile-hack.patch"
6
7ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" 5ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
8 6
9EXTRA_OECONF += "--disable-libunwind-exceptions" 7EXTRA_OECONF += "--disable-libunwind-exceptions"