mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-11-27 06:09:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't omit directories from the constructed rpath.

Browse Source 
This fixes bug introduced by 0e1b333324.

* build-aux/ltmain.in: Don't omit paths that are not under $progdir
from the compiled_rpath.  Append them to the end of it.
* NEWS: Update for bug fix.
This commit is contained in:
Sergey Poznyakoff 2024-10-09 21:34:01 +03:00 committed by Ileana Dumitrescu
parent d405ede870
commit b6c8850a43
No known key found for this signature in database
GPG Key ID: 6570EA01146F7354
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -9,6 +9,9 @@ NEWS - list of user-visible changes between releases of GNU Libtool
- Fix errors when executing 'make distclean' and 'make maintainer-clean'. - Fix errors when executing 'make distclean' and 'make maintainer-clean'.
- Fix bug where the constructed rpath omit directories, instead of
appending them to the end.
* Noteworthy changes in release 2.5.3 (2024-09-25) [stable] * Noteworthy changes in release 2.5.3 (2024-09-25) [stable]

9
build-aux/ltmain.in
View File

@ -4632,6 +4632,7 @@ func_mode_link ()
finalize_command=$nonopt finalize_command=$nonopt
compile_rpath= compile_rpath=
compile_rpath_tail=
finalize_rpath= finalize_rpath=
compile_shlibpath= compile_shlibpath=
finalize_shlibpath= finalize_shlibpath=
@ -6273,10 +6274,11 @@ func_mode_link ()
case " $sys_lib_dlsearch_path " in case " $sys_lib_dlsearch_path " in
*" $absdir "*) ;; *" $absdir "*) ;;
*) *)
case "$compile_rpath " in case "$compile_rpath$compile_rpath_tail " in
*" $absdir "*) ;; *" $absdir "*) ;;
*) case $absdir in *) case $absdir in
"$progdir/"*) func_append compile_rpath " $absdir" ;; "$progdir/"*) func_append compile_rpath " $absdir" ;;
*) func_append compile_rpath_tail " $absdir" ;;
esac esac
esac esac
;; ;;
@ -6349,10 +6351,11 @@ func_mode_link ()
case " $sys_lib_dlsearch_path " in case " $sys_lib_dlsearch_path " in
*" $absdir "*) ;; *" $absdir "*) ;;
*) *)
case "$compile_rpath " in case "$compile_rpath$compile_rpath_tail " in
*" $absdir "*) ;; *" $absdir "*) ;;
*) case $absdir in *) case $absdir in
"$progdir/"*) func_append compile_rpath " $absdir" ;; "$progdir/"*) func_append compile_rpath " $absdir" ;;
*) func_append compile_rpath_tail " $absdir" ;;
esac esac
esac esac
;; ;;
@ -6716,6 +6719,8 @@ func_mode_link ()
done # for deplib in $libs done # for deplib in $libs
func_append temp_rpath "$temp_rpath_tail" func_append temp_rpath "$temp_rpath_tail"
func_append compile_rpath "$compile_rpath_tail"
if test link = "$pass"; then if test link = "$pass"; then
if test prog = "$linkmode"; then if test prog = "$linkmode"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs" compile_deplibs="$new_inherited_linker_flags $compile_deplibs"