From 544c53bd75162778c54ab731d5bdd25832530d0e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 25 Oct 2021 19:40:53 +0100 Subject: libtool: Update patchset to match those submitted upstream I went through and cleaned up the headers/descriptions on several of the libtool patchset and submitted (or resubmitted in some cases) them upstream. This patch updates/renames them to match what I did. I did fix some whitespace issues in some of the patches and also merged one case where we had a patch of already patched code. This makes it clear what was submitted and makes resubmission easier if ever needed too. (From OE-Core rev: 9bb9a4e8bd408c7a42913aa3e1ec541919b59584) Signed-off-by: Richard Purdie --- .../libtool/libtool/fix-rpath.patch | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 meta/recipes-devtools/libtool/libtool/fix-rpath.patch (limited to 'meta/recipes-devtools/libtool/libtool/fix-rpath.patch') diff --git a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch deleted file mode 100644 index a2ec9473e7..0000000000 --- a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch +++ /dev/null @@ -1,65 +0,0 @@ -We don't want to add RPATHS which match default linker -search paths, they're a waste of space. This patch -filters libtools list and removes the ones we don't need. - -RP 23/9/2011 - -Upstream-Status: Pending - -Updated by: Robert Yang - -Index: libtool-2.4.2/build-aux/ltmain.in -=================================================================== ---- libtool-2.4.2.orig/build-aux/ltmain.in -+++ libtool-2.4.2/build-aux/ltmain.in -@@ -7286,8 +7286,14 @@ EOF - esac - fi - else -- eval flag=\"$hardcode_libdir_flag_spec\" -- func_append dep_rpath " $flag" -+ # We only want to hardcode in an rpath if it isn't in the -+ # default dlsearch path. -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append dep_rpath " $flag" -+ ;; -+ esac - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in -@@ -8019,8 +8025,14 @@ EOF - esac - fi - else -- eval flag=\"$hardcode_libdir_flag_spec\" -- func_append rpath " $flag" -+ # We only want to hardcode in an rpath if it isn't in the -+ # default dlsearch path. -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath+=" $flag" -+ ;; -+ esac - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in -@@ -8070,8 +8082,14 @@ EOF - esac - fi - else -- eval flag=\"$hardcode_libdir_flag_spec\" -- func_append rpath " $flag" -+ # We only want to hardcode in an rpath if it isn't in the -+ # default dlsearch path. -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" -+ ;; -+ esac - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in -- cgit v1.2.3-54-g00ecf