summaryrefslogtreecommitdiffstats
path: root/meta
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:25:14 +0100
commitdeee2b224bc49ad30814169aa094aa0610ee9956 (patch)
tree6261dc84cd0843ff4276f09dea55b7545870ceb5 /meta
parent8592e828261fb4a48b8156e11b5859d38aeb403f (diff)
downloadpoky-deee2b224bc49ad30814169aa094aa0610ee9956.tar.gz
libtool: update rpath normalization to use builtin
Use the built-in normalization function instead of the sed hack. (From OE-Core rev: ba8263e5dc520f5024fc76d8bd2e10fe0564b0e2) Signed-off-by: Andy Ross <andy.ross@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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"
8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
9 file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" 9 file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
10 10
11INC_PR = "r4" 11INC_PR = "r5"
12 12
13SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
14 file://trailingslash.patch \ 14 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.
7Signed-off-by: Andy Ross <andy.ross@windriver.com> 7Signed-off-by: Andy Ross <andy.ross@windriver.com>
8Upstream-Status: Pending 8Upstream-Status: Pending
9 9
10diff -ru a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh 10diff -ur a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
11--- a/libltdl/config/ltmain.m4sh 2012-08-16 13:58:55.058900363 -0700 11--- a/libltdl/config/ltmain.m4sh 2012-08-16 13:58:55.058900363 -0700
12+++ b/libltdl/config/ltmain.m4sh 2012-08-16 16:34:54.616627821 -0700 12+++ b/libltdl/config/ltmain.m4sh 2012-08-22 11:01:34.191345989 -0700
13@@ -7288,8 +7288,13 @@ 13@@ -7288,8 +7288,10 @@
14 else 14 else
15 # We only want to hardcode in an rpath if it isn't in the 15 # We only want to hardcode in an rpath if it isn't in the
16 # default dlsearch path. 16 # default dlsearch path.
17+ libdir_norm=`echo $libdir \ 17+ func_normal_abspath "$libdir"
18+ | sed 's/\/\+\.\(\/\+\|$\)/\//g' \ 18+ libdir_norm=$func_normal_abspath_result
19+ | sed 's/[^\/]\+\/\+\.\.\(\/\+\|$\)//g' \
20+ | sed 's/\/\+/\//g' \
21+ | sed 's/\(.\)\/$/\1/g'`
22 case " $sys_lib_dlsearch_path " in 19 case " $sys_lib_dlsearch_path " in
23- *" $libdir "*) ;; 20- *" $libdir "*) ;;
24+ *" $libdir_norm "*) ;; 21+ *" $libdir_norm "*) ;;
25 *) eval flag=\"$hardcode_libdir_flag_spec\" 22 *) eval flag=\"$hardcode_libdir_flag_spec\"
26 func_append dep_rpath " $flag" 23 func_append dep_rpath " $flag"
27 ;; 24 ;;
28@@ -8027,8 +8032,13 @@ 25@@ -8027,8 +8029,10 @@
29 else 26 else
30 # We only want to hardcode in an rpath if it isn't in the 27 # We only want to hardcode in an rpath if it isn't in the
31 # default dlsearch path. 28 # default dlsearch path.
32+ libdir_norm=`echo $libdir \ 29+ func_normal_abspath "$libdir"
33+ | sed 's/\/\+\.\(\/\+\|$\)/\//g' \ 30+ libdir_norm=$func_normal_abspath_result
34+ | sed 's/[^\/]\+\/\+\.\.\(\/\+\|$\)//g' \
35+ | sed 's/\/\+/\//g' \
36+ | sed 's/\(.\)\/$/\1/g'`
37 case " $sys_lib_dlsearch_path " in 31 case " $sys_lib_dlsearch_path " in
38- *" $libdir "*) ;; 32- *" $libdir "*) ;;
39+ *" $libdir_norm "*) ;; 33+ *" $libdir_norm "*) ;;