summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-25 12:36:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-26 16:37:56 +0100
commit32edeb391f2107bb66b361cdcd4b8d4447731c33 (patch)
tree9b6530bed82fe4ec864def52213da73f2f74def5 /meta/recipes-devtools/libtool
parentb8819b02dc4ff29d678cc55887dfe6c2d109a67d (diff)
downloadpoky-32edeb391f2107bb66b361cdcd4b8d4447731c33.tar.gz
gcc/libtool/perl: Fix various path to sed-native problems
If sed-native is built before these programs, hardcoded paths to sed-native can end up in scripts and other parts of the system which may cause issues if they are later used from sstate and sed-native is not installed. To avoid this, this patch changes the global site configuration to specify that plain "sed" is fine to be used. We need to spell this out for gcc since it doesn't see the site files since we don't autoreconf it. We can remove the values from libtool. We tell perl to use "/bin/sed" since it requires a path and the system sed should be just fine for it. [YOCTO #4971] (From OE-Core rev: 2ec171cb188601bf18c6c2895870907024b1c52a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool')
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.2.inc3
-rw-r--r--meta/recipes-devtools/libtool/libtool-native_2.4.2.bb1
2 files changed, 0 insertions, 4 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 92e49499dd..5a67eeb9d1 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -26,9 +26,6 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
26SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" 26SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
27SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918" 27SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
28 28
29# Don't want paths to sed-native (or anything else) encoded
30CACHED_CONFIGUREVARS += "ac_cv_path_SED=sed"
31
32do_compile_prepend () { 29do_compile_prepend () {
33 # Sometimes this file doesn't get rebuilt, force the issue 30 # Sometimes this file doesn't get rebuilt, force the issue
34 rm -f ${S}/libltdl/config/ltmain.sh 31 rm -f ${S}/libltdl/config/ltmain.sh
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
index 18188ef7f3..df73f08e99 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
@@ -8,7 +8,6 @@ SRC_URI += "file://prefix.patch"
8inherit native 8inherit native
9 9
10EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}" 10EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}"
11CACHED_CONFIGUREVARS += "ac_cv_path_SED=/bin/sed"
12 11
13do_configure_prepend () { 12do_configure_prepend () {
14 # Remove any existing libtool m4 since old stale versions would break 13 # Remove any existing libtool m4 since old stale versions would break