summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-04-09 18:56:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-30 11:37:23 +0100
commit9ce94ea4a45b5aaeecb99c0872862b90b3d78977 (patch)
treee1e521fe91aa1e2a9d2a7680e7fe3137d821f6f9 /meta/recipes-devtools
parentf7337ee8c409761b569dab06e88d530f24b367d5 (diff)
downloadpoky-9ce94ea4a45b5aaeecb99c0872862b90b3d78977.tar.gz
gcc-configure: Render --with-local-prefix harmless
this option by default points to /usr/local no matter what so we cant let it sit on sidelines otherwise it will access host machine's /usr/local which may not be desired. So disable this option. This also helps in making gcc's shared state more consistent (From OE-Core rev: eee3658366e1ae9d3e429b3d3c968938d8d0f00e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-cross.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-runtime.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-sdk.inc3
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-target.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc3
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-intermediate.inc3
7 files changed, 5 insertions, 9 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 39b5f5223e..e022be4b50 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -38,6 +38,7 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True) !=
38 --enable-symvers=gnu \ 38 --enable-symvers=gnu \
39 --enable-libstdcxx-pch \ 39 --enable-libstdcxx-pch \
40 --program-prefix=${TARGET_PREFIX} \ 40 --program-prefix=${TARGET_PREFIX} \
41 --without-local-prefix \
41 ${OPTSPACE} \ 42 ${OPTSPACE} \
42 ${EXTRA_OECONF_BASE} \ 43 ${EXTRA_OECONF_BASE} \
43 ${EXTRA_OECONF_FPU} \ 44 ${EXTRA_OECONF_FPU} \
diff --git a/meta/recipes-devtools/gcc/gcc-configure-cross.inc b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
index 98961923ba..65e340a0d7 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
@@ -8,7 +8,7 @@ EXTRA_OECONF += " --enable-poison-system-directories \
8 8
9INHIBIT_DEFAULT_DEPS = "1" 9INHIBIT_DEFAULT_DEPS = "1"
10 10
11EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_exec_prefix} \ 11EXTRA_OECONF_PATHS = " \
12 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ 12 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \
13 --with-sysroot=${STAGING_DIR_TARGET} \ 13 --with-sysroot=${STAGING_DIR_TARGET} \
14 --with-build-sysroot=${STAGING_DIR_TARGET}" 14 --with-build-sysroot=${STAGING_DIR_TARGET}"
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index d2e4ab334b..095d6c16d2 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -3,7 +3,6 @@ require gcc-configure-common.inc
3CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" 3CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
4 4
5EXTRA_OECONF_PATHS = " \ 5EXTRA_OECONF_PATHS = " \
6 --with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
7 --with-gxx-include-dir=${includedir}/c++/ \ 6 --with-gxx-include-dir=${includedir}/c++/ \
8 --with-sysroot=${STAGING_DIR_TARGET} \ 7 --with-sysroot=${STAGING_DIR_TARGET} \
9 --with-build-sysroot=${STAGING_DIR_TARGET}" 8 --with-build-sysroot=${STAGING_DIR_TARGET}"
diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
index 6aac0ad887..90e20f56c7 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
@@ -4,8 +4,7 @@ require gcc-configure-common.inc
4USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' 4USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
5USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}' 5USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}'
6 6
7EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_exec_prefix} \ 7EXTRA_OECONF_PATHS = "--with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++ \
8 --with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++ \
9 --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ 8 --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
10 --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ 9 --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \
11 --with-build-sysroot=${STAGING_DIR_TARGET}" 10 --with-build-sysroot=${STAGING_DIR_TARGET}"
diff --git a/meta/recipes-devtools/gcc/gcc-configure-target.inc b/meta/recipes-devtools/gcc/gcc-configure-target.inc
index 8b169a7c54..1ee75048ba 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-target.inc
@@ -1,5 +1,4 @@
1require gcc-configure-common.inc 1require gcc-configure-common.inc
2 2
3EXTRA_OECONF_PATHS = " \ 3EXTRA_OECONF_PATHS = " \
4 --with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
5 --with-gxx-include-dir=${includedir}/c++/" 4 --with-gxx-include-dir=${includedir}/c++/"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 66c47e027c..faec391dcb 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -9,8 +9,7 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}"
9 9
10# This is intended to be a -very- basic config 10# This is intended to be a -very- basic config
11# sysroot is needed in case we use libc-initial 11# sysroot is needed in case we use libc-initial
12EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ 12EXTRA_OECONF = "--with-newlib \
13 --with-newlib \
14 --without-headers \ 13 --without-headers \
15 --disable-shared \ 14 --disable-shared \
16 --disable-threads \ 15 --disable-threads \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index c356576cd9..c940e549c5 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -14,8 +14,7 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}"
14# Glibc won't compile with gold, and building glibc is the whole point of 14# Glibc won't compile with gold, and building glibc is the whole point of
15# this recipe. So we select ld.bfd explicitly here if gold is the distro's 15# this recipe. So we select ld.bfd explicitly here if gold is the distro's
16# preferred linker. 16# preferred linker.
17EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ 17EXTRA_OECONF = "--enable-shared \
18 --enable-shared \
19 --disable-multilib \ 18 --disable-multilib \
20 --disable-threads \ 19 --disable-threads \
21 --enable-languages=c \ 20 --enable-languages=c \