CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

libtool: update rpath normalization to use builtin

Browse Source 
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>
This commit is contained in:
Andy Ross 2012-08-23 17:32:30 +00:00 committed by Richard Purdie
parent 8592e82826
commit deee2b224b
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-devtools/libtool/libtool-2.4.2.inc
View File

@ -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 \

22
meta/recipes-devtools/libtool/libtool/norm-rpath.patch
View File

@ -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 "*) ;;