From: Bruno Haible <bruno@clisp.org>
Date: Wed, 9 Oct 2024 13:57:00 +0000 (+0200)
Subject: build: Revert build failure on CentOS and Alma Linux (regression 2024-09-26).
X-Git-Tag: v0.23~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=321eee7998395e7685f1bdb8b7fc714c70ddff78;p=thirdparty%2Fgettext.git

build: Revert build failure on CentOS and Alma Linux (regression 2024-09-26).

build-aux/ltmain.sh: Revert libtool commit
0e1b33332429cd578367bd0ad420c065d5caf0ac.
---

diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index def0a431a..12d92ace5 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -6822,12 +6822,10 @@ 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
 
@@ -7746,20 +7744,8 @@ func_mode_link ()
 
       # Now actually substitute the argument into the commands.
       if test -n "$arg"; then
-	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
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
       fi
     done # argument parsing loop
 
@@ -8410,10 +8396,7 @@ func_mode_link ()
 	      # Make sure the rpath contains only unique directories.
 	      case $temp_rpath: in
 	      *"$absdir:"*) ;;
-              *) case $absdir in
-                 "$progdir/"*) func_append temp_rpath "$absdir:" ;;
-                 *)            func_append temp_rpath_tail "$absdir:" ;;
-                 esac
+	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
 	    fi
 
@@ -8425,9 +8408,7 @@ func_mode_link ()
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) case $absdir in
-                 "$progdir/"*) func_append compile_rpath " $absdir" ;;
-		 esac
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -8501,9 +8482,7 @@ func_mode_link ()
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) case $absdir in
-                 "$progdir/"*) func_append compile_rpath " $absdir" ;;
-		 esac
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -8864,8 +8843,6 @@ 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"