summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool
diff options
context:
space:
mode:
authorAndy Ross <andy.ross@windriver.com>2012-08-23 17:32:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-24 17:24:02 +0100
commitba8263e5dc520f5024fc76d8bd2e10fe0564b0e2 (patch)
tree03b9a8e10fea53c37f3629cd56a99304714738ac /meta/recipes-devtools/libtool
parentbccea580f1abb762d231f785a4e60c9cd368dcdf (diff)
downloadopenembedded-core-ba8263e5dc520f5024fc76d8bd2e10fe0564b0e2.tar.gz
openembedded-core-ba8263e5dc520f5024fc76d8bd2e10fe0564b0e2.tar.bz2
openembedded-core-ba8263e5dc520f5024fc76d8bd2e10fe0564b0e2.zip
libtool: update rpath normalization to use builtin
Use the built-in normalization function instead of the sed hack. Signed-off-by: Andy Ross <andy.ross@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool')
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.2.inc2
-rw-r--r--meta/recipes-devtools/libtool/libtool/norm-rpath.patch22
2 files changed, 9 insertions, 15 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 691427e09d..95e12a2420 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -8,7 +8,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
-INC_PR = "r4"
+INC_PR = "r5"
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://trailingslash.patch \
diff --git a/meta/recipes-devtools/libtool/libtool/norm-rpath.patch b/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
index 03a7667708..dce1576c41 100644
--- a/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
@@ -7,33 +7,27 @@ RPATH in the generated binary. Normalize before comparision.
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Upstream-Status: Pending
-diff -ru a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
+diff -ur a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
--- a/libltdl/config/ltmain.m4sh 2012-08-16 13:58:55.058900363 -0700
-+++ b/libltdl/config/ltmain.m4sh 2012-08-16 16:34:54.616627821 -0700
-@@ -7288,8 +7288,13 @@
++++ b/libltdl/config/ltmain.m4sh 2012-08-22 11:01:34.191345989 -0700
+@@ -7288,8 +7288,10 @@
else
# We only want to hardcode in an rpath if it isn't in the
# default dlsearch path.
-+ libdir_norm=`echo $libdir \
-+ | sed 's/\/\+\.\(\/\+\|$\)/\//g' \
-+ | sed 's/[^\/]\+\/\+\.\.\(\/\+\|$\)//g' \
-+ | sed 's/\/\+/\//g' \
-+ | sed 's/\(.\)\/$/\1/g'`
++ func_normal_abspath "$libdir"
++ libdir_norm=$func_normal_abspath_result
case " $sys_lib_dlsearch_path " in
- *" $libdir "*) ;;
+ *" $libdir_norm "*) ;;
*) eval flag=\"$hardcode_libdir_flag_spec\"
func_append dep_rpath " $flag"
;;
-@@ -8027,8 +8032,13 @@
+@@ -8027,8 +8029,10 @@
else
# We only want to hardcode in an rpath if it isn't in the
# default dlsearch path.
-+ libdir_norm=`echo $libdir \
-+ | sed 's/\/\+\.\(\/\+\|$\)/\//g' \
-+ | sed 's/[^\/]\+\/\+\.\.\(\/\+\|$\)//g' \
-+ | sed 's/\/\+/\//g' \
-+ | sed 's/\(.\)\/$/\1/g'`
++ func_normal_abspath "$libdir"
++ libdir_norm=$func_normal_abspath_result
case " $sys_lib_dlsearch_path " in
- *" $libdir "*) ;;
+ *" $libdir_norm "*) ;;