diff options
Diffstat (limited to 'patches/libtool-2.4.6-ltb1-2.patch')
| -rw-r--r-- | patches/libtool-2.4.6-ltb1-2.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/patches/libtool-2.4.6-ltb1-2.patch b/patches/libtool-2.4.6-ltb1-2.patch new file mode 100644 index 0000000..d27b315 --- /dev/null +++ b/patches/libtool-2.4.6-ltb1-2.patch @@ -0,0 +1,83 @@ +diff -pur libtool-2.4.6.orig/build-aux/ltmain.in libtool-2.4.6/build-aux/ltmain.in +--- libtool-2.4.6.orig/build-aux/ltmain.in 2015-02-06 14:57:56.000000000 +0200 ++++ libtool-2.4.6/build-aux/ltmain.in 2019-12-13 13:40:44.701071633 +0200 +@@ -4644,10 +4644,12 @@ func_mode_link () + xrpath= + perm_rpath= + temp_rpath= ++ temp_rpath_tail= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= ++ rpath_arg= + single_module=$wl-single_module + func_infer_tag $base_compile + +@@ -5521,8 +5523,20 @@ func_mode_link () + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then +- func_append compile_command " $arg" +- func_append finalize_command " $arg" ++ if test -n "$rpath_arg"; then ++ func_append finalize_rpath " ${arg##*,}" ++ unset rpath_arg ++ else ++ case $arg in ++ -Wl,-rpath,*) ++ func_append finalize_rpath " ${arg##*,}";; ++ -Wl,-rpath) ++ rpath_arg=1;; ++ *) ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ esac ++ fi + fi + done # argument parsing loop + +@@ -6176,7 +6190,10 @@ func_mode_link () + # Make sure the rpath contains only unique directories. + case $temp_rpath: in + *"$absdir:"*) ;; +- *) func_append temp_rpath "$absdir:" ;; ++ *) case $absdir in ++ "$progdir/"*) func_append temp_rpath "$absdir:" ;; ++ *) func_append temp_rpath_tail "$absdir:" ;; ++ esac + esac + fi + +@@ -6188,7 +6205,9 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) func_append compile_rpath " $absdir" ;; ++ *) case $absdir in ++ "$progdir/"*) func_append compile_rpath " $absdir" ;; ++ esac + esac + ;; + esac +@@ -6262,7 +6281,9 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) func_append compile_rpath " $absdir" ;; ++ *) case $absdir in ++ "$progdir/"*) func_append compile_rpath " $absdir" ;; ++ esac + esac + ;; + esac +@@ -6626,6 +6647,9 @@ func_mode_link () + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs ++ ++ func_append temp_rpath "$temp_rpath_tail" ++ + if test link = "$pass"; then + if test prog = "$linkmode"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" |