[no subject]

[Ileana Dumitrescu]

branch: master
commit b6c8850a430b2ddba58a120f32501b8966d06bd5
Author: Sergey Poznyakoff <gray@gnu.org>
AuthorDate: Wed Oct 9 21:34:01 2024 +0300

    Don't omit directories from the constructed rpath.
    
    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.
---
 NEWS                | 3 +++
 build-aux/ltmain.in | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index c89f6575..c83ad75b 100644
--- a/NEWS
+++ b/NEWS
@@ -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 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]
 
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 68aca605..2c486fa7 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -4632,6 +4632,7 @@ func_mode_link ()
     finalize_command=$nonopt
 
     compile_rpath=
+    compile_rpath_tail=
     finalize_rpath=
     compile_shlibpath=
     finalize_shlibpath=
@@ -6273,10 +6274,11 @@ func_mode_link ()
            case " $sys_lib_dlsearch_path " in
            *" $absdir "*) ;;
            *)
-             case "$compile_rpath " in
+             case "$compile_rpath$compile_rpath_tail " in
              *" $absdir "*) ;;
              *) case $absdir in
                  "$progdir/"*) func_append compile_rpath " $absdir" ;;
+                 *) func_append compile_rpath_tail " $absdir" ;;
                 esac
              esac
              ;;
@@ -6349,10 +6351,11 @@ func_mode_link ()
            case " $sys_lib_dlsearch_path " in
            *" $absdir "*) ;;
            *)
-             case "$compile_rpath " in
+             case "$compile_rpath$compile_rpath_tail " in
              *" $absdir "*) ;;
              *) case $absdir in
                  "$progdir/"*) func_append compile_rpath " $absdir" ;;
+                 *) func_append compile_rpath_tail " $absdir" ;;
                 esac
              esac
              ;;
@@ -6716,6 +6719,8 @@ func_mode_link ()
       done # for deplib in $libs
 
       func_append temp_rpath "$temp_rpath_tail"
+      func_append compile_rpath "$compile_rpath_tail"
+
       if test link = "$pass"; then
        if test prog = "$linkmode"; then
          compile_deplibs="$new_inherited_linker_flags $compile_deplibs"