Signed-off-by: Richard Purdie <[email protected]> --- .../{libtool-2.5.1.inc => libtool-2.5.2.inc} | 2 +- ...-cross_2.5.1.bb => libtool-cross_2.5.2.bb} | 0 ...ative_2.5.1.bb => libtool-native_2.5.2.bb} | 0 .../libtool/libtool/fixinstall.patch | 35 ++++++++++++------- .../{libtool_2.5.1.bb => libtool_2.5.2.bb} | 0 ...ol_2.5.1.bb => nativesdk-libtool_2.5.2.bb} | 0 6 files changed, 23 insertions(+), 14 deletions(-) rename meta/recipes-devtools/libtool/{libtool-2.5.1.inc => libtool-2.5.2.inc} (94%) rename meta/recipes-devtools/libtool/{libtool-cross_2.5.1.bb => libtool-cross_2.5.2.bb} (100%) rename meta/recipes-devtools/libtool/{libtool-native_2.5.1.bb => libtool-native_2.5.2.bb} (100%) rename meta/recipes-devtools/libtool/{libtool_2.5.1.bb => libtool_2.5.2.bb} (100%) rename meta/recipes-devtools/libtool/{nativesdk-libtool_2.5.1.bb => nativesdk-libtool_2.5.2.bb} (100%)
diff --git a/meta/recipes-devtools/libtool/libtool-2.5.1.inc b/meta/recipes-devtools/libtool/libtool-2.5.2.inc similarity index 94% rename from meta/recipes-devtools/libtool/libtool-2.5.1.inc rename to meta/recipes-devtools/libtool/libtool-2.5.2.inc index 94344d4d416..bde80e12ce7 100644 --- a/meta/recipes-devtools/libtool/libtool-2.5.1.inc +++ b/meta/recipes-devtools/libtool/libtool-2.5.2.inc @@ -18,7 +18,7 @@ SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \ file://nohardcodepaths.patch \ " -SRC_URI[sha256sum] = "6a83edafd42d4e2ebdc09579f99ce828d5f932f1738de02495cc8c2884e430ce" +SRC_URI[sha256sum] = "29275fb45b236d6ff720a433f9cd5f61ea2f52cc3aa2e5f89ba57726bda54793" inherit autotools texinfo EXTRA_AUTORECONF = "--exclude=libtoolize" diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.5.1.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.2.bb similarity index 100% rename from meta/recipes-devtools/libtool/libtool-cross_2.5.1.bb rename to meta/recipes-devtools/libtool/libtool-cross_2.5.2.bb diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.1.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.2.bb similarity index 100% rename from meta/recipes-devtools/libtool/libtool-native_2.5.1.bb rename to meta/recipes-devtools/libtool/libtool-native_2.5.2.bb diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/meta/recipes-devtools/libtool/libtool/fixinstall.patch index 48330d82fbf..94601b1beb8 100644 --- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch +++ b/meta/recipes-devtools/libtool/libtool/fixinstall.patch @@ -18,10 +18,11 @@ RP 2011/11/16 Updated by: Robert Yang <[email protected]> -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -2355,7 +2355,7 @@ func_mode_install () +Index: libtool-2.5.2/build-aux/ltmain.in +=================================================================== +--- libtool-2.5.2.orig/build-aux/ltmain.in ++++ libtool-2.5.2/build-aux/ltmain.in +@@ -2381,7 +2381,7 @@ func_mode_install () dir=$func_dirname_result func_append dir "$objdir" @@ -29,8 +30,8 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in + if test "$fast_install" = no && test -n "$relink_command"; then # Strip any trailing slash from the destination. func_stripname '' '/' "$libdir" - destlibdir=$func_stripname_result -@@ -2394,7 +2394,7 @@ func_mode_install () + destlibdir=$func_stripname_result +@@ -2419,7 +2419,7 @@ func_mode_install () shift srcname=$realname @@ -39,7 +40,7 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ -@@ -6162,15 +6162,15 @@ func_mode_link () +@@ -6276,17 +6276,17 @@ func_mode_link () # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -48,7 +49,9 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) func_append compile_rpath " $absdir" ;; +- *) case $absdir in +- "$progdir/"*) func_append compile_rpath " $absdir" ;; +- esac - esac - ;; - esac @@ -57,14 +60,16 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in + #*) + # case "$compile_rpath " in + # *" $absdir "*) ;; -+ # *) func_append compile_rpath " $absdir" ;; ++ # *) case $absdir in ++ # "$progdir/"*) func_append compile_rpath " $absdir" ;; ++ # esac + # esac + # ;; + #esac case " $sys_lib_dlsearch_path " in *" $libdir "*) ;; *) -@@ -6236,15 +6236,15 @@ func_mode_link () +@@ -6352,17 +6352,17 @@ func_mode_link () # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -73,7 +78,9 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) func_append compile_rpath " $absdir" ;; +- *) case $absdir in +- "$progdir/"*) func_append compile_rpath " $absdir" ;; +- esac - esac - ;; - esac @@ -82,14 +89,16 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in + #*) + # case "$compile_rpath " in + # *" $absdir "*) ;; -+ # *) func_append compile_rpath " $absdir" ;; ++ # *) case $absdir in ++ # "$progdir/"*) func_append compile_rpath " $absdir" ;; ++ # esac + # esac + # ;; + #esac case " $sys_lib_dlsearch_path " in *" $libdir "*) ;; *) -@@ -6590,8 +6590,8 @@ func_mode_link () +@@ -6705,8 +6705,8 @@ func_mode_link () eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "'$deplib' is not a valid libtool archive" diff --git a/meta/recipes-devtools/libtool/libtool_2.5.1.bb b/meta/recipes-devtools/libtool/libtool_2.5.2.bb similarity index 100% rename from meta/recipes-devtools/libtool/libtool_2.5.1.bb rename to meta/recipes-devtools/libtool/libtool_2.5.2.bb diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.1.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.2.bb similarity index 100% rename from meta/recipes-devtools/libtool/nativesdk-libtool_2.5.1.bb rename to meta/recipes-devtools/libtool/nativesdk-libtool_2.5.2.bb
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#204054): https://lists.openembedded.org/g/openembedded-core/message/204054 Mute This Topic: https://lists.openembedded.org/mt/108215564/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
