diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-02-18 10:13:48 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-21 17:53:51 +0000 |
| commit | 489465b82be73da1d845a0cea601b41ce5ade411 (patch) | |
| tree | 92bd04d44d3d533e87a53e2461519c23262e79b7 /meta/recipes-devtools | |
| parent | 3c314b9b2ac4f96a72f651ee5175748d2d0fc9c1 (diff) | |
| download | openembedded-core-489465b82be73da1d845a0cea601b41ce5ade411.tar.gz openembedded-core-489465b82be73da1d845a0cea601b41ce5ade411.tar.bz2 openembedded-core-489465b82be73da1d845a0cea601b41ce5ade411.zip | |
libtool: avoid absolute pathnames of general utils
addded a new patch:
libtool/avoid_absolute_paths_for_general_utils.patch
This fixes [BUGID #154]
This fixes [BUGID #734]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
6 files changed, 43 insertions, 5 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb index e3b40f2560..25ac580e4a 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb @@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r1" +PR = "r2" PACKAGES = "" SRC_URI += "file://prefix.patch" diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.bb index 4163e8972a..423622fa2e 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb @@ -2,7 +2,7 @@ require libtool-${PV}.inc DEPENDS = "" -PR = "r1" +PR = "r2" SRC_URI += "file://prefix.patch" inherit native diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb index 45c9af66c6..4f67fed445 100644 --- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb @@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r1" +PR = "r2" SRC_URI += "file://prefix.patch" inherit nativesdk diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool.inc index 8701c820d2..e066ffa386 100644 --- a/meta/recipes-devtools/libtool/libtool.inc +++ b/meta/recipes-devtools/libtool/libtool.inc @@ -14,7 +14,8 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://rename-with-sysroot.patch \ file://resolve-sysroot.patch \ file://use-sysroot-in-libpath.patch \ - file://fix-final-rpath.patch" + file://fix-final-rpath.patch \ + file://avoid_absolute_paths_for_general_utils.patch " do_compile_prepend () { # Sometimes this file doesn't get rebuilt, force the issue diff --git a/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch b/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch new file mode 100644 index 0000000000..f158171ef7 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch @@ -0,0 +1,37 @@ +On some distro the path of utils like sed, grep etc are different than the +buildhost system. + This was causing runtime issue while running libtoolize from the +libtool-nativesdk package. + This patch takes out the absolute paths of these utils, and put +responsibility on the end-user to set correct paths for these utilities to be +found out. + +Nitin A Kamble <nitin.a.kamble@intel.com> +2011/02/18 + + +Index: libtool-2.4/libltdl/config/general.m4sh +=================================================================== +--- libtool-2.4.orig/libltdl/config/general.m4sh 2010-08-31 23:02:45.000000000 -0700 ++++ libtool-2.4/libltdl/config/general.m4sh 2011-02-18 09:59:09.482038240 -0800 +@@ -45,15 +45,15 @@ + M4SH_VERBATIM([[ + : ${CP="cp -f"} + test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +-: ${EGREP="@EGREP@"} +-: ${FGREP="@FGREP@"} +-: ${GREP="@GREP@"} +-: ${LN_S="@LN_S@"} ++: ${EGREP="egrep"} ++: ${FGREP="fgrep"} ++: ${GREP="grep"} ++: ${LN_S="ln -s"} + : ${MAKE="make"} + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="@SED@"} ++: ${SED="sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + diff --git a/meta/recipes-devtools/libtool/libtool_2.4.bb b/meta/recipes-devtools/libtool/libtool_2.4.bb index a820bed0dd..e1a9a10ffd 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.bb @@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r1" +PR = "r2" # # We want the results of libtool-cross preserved - don't stage anything ourselves. |