2103f3557e
Keep the library dependency list generated by the compiler as-is. Some libraries are given multiple times to satisfy proper symbol resolution, don't break it. Refer to rhbz#2043517 [1] for more details. Patch proposal sent upstream [2]. [1] https://bugzilla.redhat.com/show_bug.cgi?id=2043517 [2] https://lists.gnu.org/archive/html/libtool-patches/2022-02/msg00000.html Reviewed-by: Carlos O'Donell <carlos@redhat.com>
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
diff -r -U5 libtool-2.4.6/build-aux/ltmain.in libtool-2.4.6.new/build-aux/ltmain.in
|
|
--- libtool-2.4.6/build-aux/ltmain.in 2022-02-22 09:21:35.317958251 +0100
|
|
+++ libtool-2.4.6.new/build-aux/ltmain.in 2022-02-22 09:16:10.117571787 +0100
|
|
@@ -501,21 +501,14 @@
|
|
fi
|
|
|
|
# preserve --debug
|
|
test : = "$debug_cmd" || func_append preserve_args " --debug"
|
|
|
|
- case $host in
|
|
- # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
|
|
- # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
|
|
- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
|
|
- # don't eliminate duplications in $postdeps and $predeps
|
|
- opt_duplicate_compiler_generated_deps=:
|
|
- ;;
|
|
- *)
|
|
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
|
|
- ;;
|
|
- esac
|
|
+ # Keeping compiler generated duplicates in $postdeps and $predeps is not
|
|
+ # harmful, and is necessary in a majority of systems that use it to satisfy
|
|
+ # symbol dependencies.
|
|
+ opt_duplicate_compiler_generated_deps=:
|
|
|
|
$opt_help || {
|
|
# Sanity checks first:
|
|
func_check_version_match
|
|
|
|
diff -r -U5 libtool-2.4.6/build-aux/ltmain.sh libtool-2.4.6.new/build-aux/ltmain.sh
|
|
--- libtool-2.4.6/build-aux/ltmain.sh 2015-02-15 17:15:12.000000000 +0100
|
|
+++ libtool-2.4.6.new/build-aux/ltmain.sh 2022-02-22 09:16:44.783613061 +0100
|
|
@@ -2413,21 +2413,14 @@
|
|
fi
|
|
|
|
# preserve --debug
|
|
test : = "$debug_cmd" || func_append preserve_args " --debug"
|
|
|
|
- case $host in
|
|
- # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
|
|
- # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
|
|
- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
|
|
- # don't eliminate duplications in $postdeps and $predeps
|
|
- opt_duplicate_compiler_generated_deps=:
|
|
- ;;
|
|
- *)
|
|
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
|
|
- ;;
|
|
- esac
|
|
+ # Keeping compiler generated duplicates in $postdeps and $predeps is not
|
|
+ # harmful, and is necessary in a majority of systems that use it to satisfy
|
|
+ # symbol dependencies.
|
|
+ opt_duplicate_compiler_generated_deps=:
|
|
|
|
$opt_help || {
|
|
# Sanity checks first:
|
|
func_check_version_match
|
|
|