diff options
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-common.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool-2.4.2.inc | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool-native_2.4.2.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl-native_5.14.3.bb | 1 | ||||
-rw-r--r-- | meta/site/common | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index b87ea62570..dc44cc9f08 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc | |||
@@ -48,6 +48,7 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True) != | |||
48 | ${@get_gcc_mips_plt_setting(bb, d)} \ | 48 | ${@get_gcc_mips_plt_setting(bb, d)} \ |
49 | ${@get_gcc_multiarch_setting(bb, d)}" | 49 | ${@get_gcc_multiarch_setting(bb, d)}" |
50 | 50 | ||
51 | export ac_cv_path_SED = 'sed' | ||
51 | export gcc_cv_collect2_libs = 'none required' | 52 | export gcc_cv_collect2_libs = 'none required' |
52 | # We need to set gcc_cv_collect2_libs else there is cross-compilation badness | 53 | # We need to set gcc_cv_collect2_libs else there is cross-compilation badness |
53 | # in the config.log files (which might not get generated until do_compile | 54 | # in the config.log files (which might not get generated until do_compile |
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 \ | |||
26 | SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" | 26 | SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" |
27 | SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918" | 27 | SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918" |
28 | 28 | ||
29 | # Don't want paths to sed-native (or anything else) encoded | ||
30 | CACHED_CONFIGUREVARS += "ac_cv_path_SED=sed" | ||
31 | |||
32 | do_compile_prepend () { | 29 | do_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" | |||
8 | inherit native | 8 | inherit native |
9 | 9 | ||
10 | EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}" | 10 | EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}" |
11 | CACHED_CONFIGUREVARS += "ac_cv_path_SED=/bin/sed" | ||
12 | 11 | ||
13 | do_configure_prepend () { | 12 | do_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 |
diff --git a/meta/recipes-devtools/perl/perl-native_5.14.3.bb b/meta/recipes-devtools/perl/perl-native_5.14.3.bb index 9f0b8a1c19..c9ec2d2655 100644 --- a/meta/recipes-devtools/perl/perl-native_5.14.3.bb +++ b/meta/recipes-devtools/perl/perl-native_5.14.3.bb | |||
@@ -63,6 +63,7 @@ do_configure () { | |||
63 | -Di_syslog \ | 63 | -Di_syslog \ |
64 | -Duseperlio \ | 64 | -Duseperlio \ |
65 | -Dman3ext=3pm \ | 65 | -Dman3ext=3pm \ |
66 | -Dsed=/bin/sed \ | ||
66 | -Uafs \ | 67 | -Uafs \ |
67 | -Ud_csh \ | 68 | -Ud_csh \ |
68 | -Uusesfio \ | 69 | -Uusesfio \ |
diff --git a/meta/site/common b/meta/site/common index 1214a13515..5ccc14f8c9 100644 --- a/meta/site/common +++ b/meta/site/common | |||
@@ -17,3 +17,5 @@ shadow_cv_passwd_dir=${bindir} | |||
17 | 17 | ||
18 | # python: deactivate a runtime check for ipv6-support in python >=2.7.1 that fails when cross-compiling | 18 | # python: deactivate a runtime check for ipv6-support in python >=2.7.1 that fails when cross-compiling |
19 | ac_cv_buggy_getaddrinfo=no | 19 | ac_cv_buggy_getaddrinfo=no |
20 | |||
21 | ac_cv_path_SED=sed | ||