From 489465b82be73da1d845a0cea601b41ce5ade411 Mon Sep 17 00:00:00 2001
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Fri, 18 Feb 2011 10:13:48 -0800
Subject: 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>
---
 meta/recipes-devtools/libtool/libtool-cross_2.4.bb |  2 +-
 .../recipes-devtools/libtool/libtool-native_2.4.bb |  2 +-
 .../libtool/libtool-nativesdk_2.4.bb               |  2 +-
 meta/recipes-devtools/libtool/libtool.inc          |  3 +-
 .../avoid_absolute_paths_for_general_utils.patch   | 37 ++++++++++++++++++++++
 meta/recipes-devtools/libtool/libtool_2.4.bb       |  2 +-
 6 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch

(limited to 'meta/recipes-devtools/libtool')

diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
index e3b40f2..25ac580 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 4163e89..423622f 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 45c9af6..4f67fed 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 8701c82..e066ffa 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 0000000..f158171
--- /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 a820bed..e1a9a10 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.
-- 
cgit v1.1