summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-25 19:40:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-26 12:08:18 +0100
commit544c53bd75162778c54ab731d5bdd25832530d0e (patch)
tree4d19a790628fc8521c685361d2cea3c7c5201f9b /meta/recipes-devtools/libtool/libtool/fix-rpath.patch
parent805d4dd978be7551edc1789f6bdde761d4173ceb (diff)
downloadpoky-544c53bd75162778c54ab731d5bdd25832530d0e.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/fix-rpath.patch')
-rw-r--r--meta/recipes-devtools/libtool/libtool/fix-rpath.patch65
1 files changed, 0 insertions, 65 deletions
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 @@
1We don't want to add RPATHS which match default linker
2search paths, they're a waste of space. This patch
3filters libtools list and removes the ones we don't need.
4
5RP 23/9/2011
6
7Upstream-Status: Pending
8
9Updated by: Robert Yang <liezhi.yang@windriver.com>
10
11Index: libtool-2.4.2/build-aux/ltmain.in
12===================================================================
13--- libtool-2.4.2.orig/build-aux/ltmain.in
14+++ libtool-2.4.2/build-aux/ltmain.in
15@@ -7286,8 +7286,14 @@ EOF
16 esac
17 fi
18 else
19- eval flag=\"$hardcode_libdir_flag_spec\"
20- func_append dep_rpath " $flag"
21+ # We only want to hardcode in an rpath if it isn't in the
22+ # default dlsearch path.
23+ case " $sys_lib_dlsearch_path " in
24+ *" $libdir "*) ;;
25+ *) eval flag=\"$hardcode_libdir_flag_spec\"
26+ func_append dep_rpath " $flag"
27+ ;;
28+ esac
29 fi
30 elif test -n "$runpath_var"; then
31 case "$perm_rpath " in
32@@ -8019,8 +8025,14 @@ EOF
33 esac
34 fi
35 else
36- eval flag=\"$hardcode_libdir_flag_spec\"
37- func_append rpath " $flag"
38+ # We only want to hardcode in an rpath if it isn't in the
39+ # default dlsearch path.
40+ case " $sys_lib_dlsearch_path " in
41+ *" $libdir "*) ;;
42+ *) eval flag=\"$hardcode_libdir_flag_spec\"
43+ rpath+=" $flag"
44+ ;;
45+ esac
46 fi
47 elif test -n "$runpath_var"; then
48 case "$perm_rpath " in
49@@ -8070,8 +8082,14 @@ EOF
50 esac
51 fi
52 else
53- eval flag=\"$hardcode_libdir_flag_spec\"
54- func_append rpath " $flag"
55+ # We only want to hardcode in an rpath if it isn't in the
56+ # default dlsearch path.
57+ case " $sys_lib_dlsearch_path " in
58+ *" $libdir "*) ;;
59+ *) eval flag=\"$hardcode_libdir_flag_spec\"
60+ func_append rpath " $flag"
61+ ;;
62+ esac
63 fi
64 elif test -n "$runpath_var"; then
65 case "$finalize_perm_rpath " in