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/libtool | |
parent | 3c314b9b2ac4f96a72f651ee5175748d2d0fc9c1 (diff) | |
download | poky-489465b82be73da1d845a0cea601b41ce5ade411.tar.gz |
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/libtool')
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 @@ | |||
1 | require libtool-${PV}.inc | 1 | require libtool-${PV}.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | PACKAGES = "" | 4 | PACKAGES = "" |
5 | SRC_URI += "file://prefix.patch" | 5 | SRC_URI += "file://prefix.patch" |
6 | 6 | ||
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 | |||
2 | 2 | ||
3 | DEPENDS = "" | 3 | DEPENDS = "" |
4 | 4 | ||
5 | PR = "r1" | 5 | PR = "r2" |
6 | SRC_URI += "file://prefix.patch" | 6 | SRC_URI += "file://prefix.patch" |
7 | 7 | ||
8 | inherit native | 8 | 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 @@ | |||
1 | require libtool-${PV}.inc | 1 | require libtool-${PV}.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | SRC_URI += "file://prefix.patch" | 4 | SRC_URI += "file://prefix.patch" |
5 | 5 | ||
6 | inherit nativesdk | 6 | 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 \ | |||
14 | file://rename-with-sysroot.patch \ | 14 | file://rename-with-sysroot.patch \ |
15 | file://resolve-sysroot.patch \ | 15 | file://resolve-sysroot.patch \ |
16 | file://use-sysroot-in-libpath.patch \ | 16 | file://use-sysroot-in-libpath.patch \ |
17 | file://fix-final-rpath.patch" | 17 | file://fix-final-rpath.patch \ |
18 | file://avoid_absolute_paths_for_general_utils.patch " | ||
18 | 19 | ||
19 | do_compile_prepend () { | 20 | do_compile_prepend () { |
20 | # Sometimes this file doesn't get rebuilt, force the issue | 21 | # 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 @@ | |||
1 | On some distro the path of utils like sed, grep etc are different than the | ||
2 | buildhost system. | ||
3 | This was causing runtime issue while running libtoolize from the | ||
4 | libtool-nativesdk package. | ||
5 | This patch takes out the absolute paths of these utils, and put | ||
6 | responsibility on the end-user to set correct paths for these utilities to be | ||
7 | found out. | ||
8 | |||
9 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
10 | 2011/02/18 | ||
11 | |||
12 | |||
13 | Index: libtool-2.4/libltdl/config/general.m4sh | ||
14 | =================================================================== | ||
15 | --- libtool-2.4.orig/libltdl/config/general.m4sh 2010-08-31 23:02:45.000000000 -0700 | ||
16 | +++ libtool-2.4/libltdl/config/general.m4sh 2011-02-18 09:59:09.482038240 -0800 | ||
17 | @@ -45,15 +45,15 @@ | ||
18 | M4SH_VERBATIM([[ | ||
19 | : ${CP="cp -f"} | ||
20 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} | ||
21 | -: ${EGREP="@EGREP@"} | ||
22 | -: ${FGREP="@FGREP@"} | ||
23 | -: ${GREP="@GREP@"} | ||
24 | -: ${LN_S="@LN_S@"} | ||
25 | +: ${EGREP="egrep"} | ||
26 | +: ${FGREP="fgrep"} | ||
27 | +: ${GREP="grep"} | ||
28 | +: ${LN_S="ln -s"} | ||
29 | : ${MAKE="make"} | ||
30 | : ${MKDIR="mkdir"} | ||
31 | : ${MV="mv -f"} | ||
32 | : ${RM="rm -f"} | ||
33 | -: ${SED="@SED@"} | ||
34 | +: ${SED="sed"} | ||
35 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} | ||
36 | : ${Xsed="$SED -e 1s/^X//"} | ||
37 | |||
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 @@ | |||
1 | require libtool-${PV}.inc | 1 | require libtool-${PV}.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | # | 5 | # |
6 | # We want the results of libtool-cross preserved - don't stage anything ourselves. | 6 | # We want the results of libtool-cross preserved - don't stage anything ourselves. |