diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2014-08-17 23:24:03 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 09:26:10 +0100 |
| commit | f95e62b9705d42f234a9c4dd809d56c904c7095a (patch) | |
| tree | ec3edebdb2ab1a6a7ac889b5390f76aea5d17faa | |
| parent | 7d3d6a35fdb388d384357dbe98e7c202679e4a1d (diff) | |
| download | poky-f95e62b9705d42f234a9c4dd809d56c904c7095a.tar.gz | |
libtool: add bash to RDEPENDS_libtool
* Set CONFIG_SHELL="/bin/bash"
* Add bash to RDEPENDS_libtool
We had already set CONFIG_SHELL="/bin/bash" for libtool-native,
libtool-cross and nativesdk-libtool, now also set for target libtool, if
we don't set this, libtool would use /bin/sh, /bin/bash, /bin/ksh or
/bin/sh5 according to the host, and the build is undetermined, this
patch can fix the problem, libtool is a development tool, rdepends on
bash should not cause toubles (for example, the size of the image)
Have tried to set CONFIG_SHELL="/bin/sh" (/bin/sh -> dash), but there is
still a few bashsim in the output libtool.
(From OE-Core rev: c07f09b1b261b0d480544a6100f6a83835c62019)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc index 9c50d46fe2..0f1964b57b 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc | |||
| @@ -49,3 +49,5 @@ FILES_libltdl = "${libdir}/libltdl${SOLIBS}" | |||
| 49 | FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}" | 49 | FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}" |
| 50 | FILES_libltdl-staticdev = "${libdir}/libltdl.a" | 50 | FILES_libltdl-staticdev = "${libdir}/libltdl.a" |
| 51 | FILES_libltdl-dbg = "${libdir}/.debug/" | 51 | FILES_libltdl-dbg = "${libdir}/.debug/" |
| 52 | |||
| 53 | export CONFIG_SHELL="/bin/bash" | ||
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb index 72fad37eaf..34aae0bf13 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb | |||
| @@ -39,5 +39,3 @@ libtoolcross_sysroot_preprocess () { | |||
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | SSTATE_SCAN_FILES += "libtoolize *-libtool" | 41 | SSTATE_SCAN_FILES += "libtoolize *-libtool" |
| 42 | |||
| 43 | export CONFIG_SHELL="/bin/bash" | ||
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 f1051d84f3..f03859e061 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb | |||
| @@ -21,5 +21,3 @@ do_install () { | |||
| 21 | install -d ${D}${bindir}/ | 21 | install -d ${D}${bindir}/ |
| 22 | install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool | 22 | install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool |
| 23 | } | 23 | } |
| 24 | |||
| 25 | export CONFIG_SHELL="/bin/bash" | ||
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.2.bb b/meta/recipes-devtools/libtool/libtool_2.4.2.bb index a2eb4ea437..d3f94284d4 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.2.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.2.bb | |||
| @@ -2,6 +2,8 @@ require libtool-${PV}.inc | |||
| 2 | 2 | ||
| 3 | PR = "${INC_PR}.0" | 3 | PR = "${INC_PR}.0" |
| 4 | 4 | ||
| 5 | RDEPENDS_${PN} += "bash" | ||
| 6 | |||
| 5 | # | 7 | # |
| 6 | # We want the results of libtool-cross preserved - don't stage anything ourselves. | 8 | # We want the results of libtool-cross preserved - don't stage anything ourselves. |
| 7 | # | 9 | # |
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb index fff15e916d..7b5c97a97a 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb | |||
| @@ -31,5 +31,3 @@ libtoolnativesdk_sysroot_preprocess () { | |||
| 31 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | 31 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ |
| 32 | install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool | 32 | install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool |
| 33 | } | 33 | } |
| 34 | |||
| 35 | export CONFIG_SHELL="/bin/bash" | ||
