format patches
This commit is contained in:
openKylinBot
parent
dd68ce8d2a
commit
df8400a65e
|
|
@ -1,4 +1,3 @@
|
|||
From 702a97fbb09bd7088a50f2b239016d1e32843c24 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Raiskup <praiskup@redhat.com>
|
||||
Date: Fri, 18 Sep 2015 10:36:43 +0200
|
||||
Subject: [PATCH 01/20] libtool: fix GCC linking with -specs=*
|
||||
|
|
@ -32,6 +31,3 @@ index d5cf07a..0c40da0 100644
|
|||
func_quote_for_eval "$arg"
|
||||
arg=$func_quote_for_eval_result
|
||||
func_append compile_command " $arg"
|
||||
--
|
||||
2.7.0.rc3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
From 351a88feee66eda6ce33eb06acdebb8e9c6d6716 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Raiskup <praiskup@redhat.com>
|
||||
Date: Fri, 18 Sep 2015 23:17:07 +0200
|
||||
Subject: [PATCH 03/20] libtoolize: fix infinite recursion in m4
|
||||
|
|
@ -34,11 +33,8 @@ for comments.
|
|||
|
||||
Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
|
||||
---
|
||||
NEWS | 4 ++++
|
||||
NO-THANKS | 1 +
|
||||
bootstrap | 42 +++++++++++++++++++++++++++---------------
|
||||
gl/build-aux/extract-trace | 42 +++++++++++++++++++++++++++---------------
|
||||
4 files changed, 59 insertions(+), 30 deletions(-)
|
||||
bootstrap | 42 +++++++++++++++++++++++++++---------------
|
||||
1 file changed, 27 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/bootstrap b/bootstrap
|
||||
index 4596413..17fb169 100755
|
||||
|
|
@ -113,6 +109,3 @@ index 4596413..17fb169 100755
|
|||
'
|
||||
|
||||
_G_save=$IFS
|
||||
--
|
||||
2.7.0.rc3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,235 +0,0 @@
|
|||
From 32f0df9835ac15ac17e04be57c368172c3ad1d19 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Raiskup <praiskup@redhat.com>
|
||||
Date: Sun, 4 Oct 2015 21:55:03 +0200
|
||||
Subject: [PATCH] libtool: mitigate the $sed_quote_subst slowdown
|
||||
|
||||
When it is reasonably possible, use shell implementation for
|
||||
quoting.
|
||||
|
||||
References:
|
||||
http://lists.gnu.org/archive/html/libtool/2015-03/msg00005.html
|
||||
http://lists.gnu.org/archive/html/libtool/2015-02/msg00000.html
|
||||
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20006
|
||||
|
||||
* gl/build-aux/funclib.sh (func_quote): New function that can be
|
||||
used as substitution for '$SED $sed_quote_subst' call.
|
||||
* build-aux/ltmain.in (func_emit_wrapper): Use func_quote instead
|
||||
of '$SED $sed_quote_subst'.
|
||||
(func_mode_link): Likewise.
|
||||
* NEWS: Document.
|
||||
* bootstrap: Sync with funclib.sh.
|
||||
---
|
||||
NEWS | 3 +++
|
||||
bootstrap | 61 +++++++++++++++++++++++++++++++++++++++++++------
|
||||
build-aux/ltmain.in | 10 ++++----
|
||||
gl/build-aux/funclib.sh | 61 +++++++++++++++++++++++++++++++++++++++++++------
|
||||
4 files changed, 117 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/bootstrap b/bootstrap
|
||||
index c179f51d..fe9e9cac 100755
|
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -230,7 +230,7 @@ vc_ignore=
|
||||
|
||||
# Source required external libraries:
|
||||
# Set a version string for this script.
|
||||
-scriptversion=2015-01-20.17; # UTC
|
||||
+scriptversion=2015-10-04.22; # UTC
|
||||
|
||||
# General shell script boiler plate, and helper functions.
|
||||
# Written by Gary V. Vaughan, 2004
|
||||
@@ -1257,6 +1257,57 @@ func_relative_path ()
|
||||
}
|
||||
|
||||
|
||||
+# func_quote ARG
|
||||
+# --------------
|
||||
+# Aesthetically quote one ARG, store the result into $func_quote_result. Note
|
||||
+# that we keep attention to performance here (so far O(N) complexity as long as
|
||||
+# func_append is O(1)).
|
||||
+func_quote ()
|
||||
+{
|
||||
+ $debug_cmd
|
||||
+
|
||||
+ func_quote_result=$1
|
||||
+
|
||||
+ case $func_quote_result in
|
||||
+ *[\\\`\"\$]*)
|
||||
+ case $func_quote_result in
|
||||
+ *'*'*|*'['*)
|
||||
+ func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"`
|
||||
+ return 0
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
+ func_quote_old_IFS=$IFS
|
||||
+ for _G_char in '\' '`' '"' '$'
|
||||
+ do
|
||||
+ # STATE($1) PREV($2) SEPARATOR($3)
|
||||
+ set start "" ""
|
||||
+ func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy
|
||||
+ IFS=$_G_char
|
||||
+ for _G_part in $func_quote_result
|
||||
+ do
|
||||
+ case $1 in
|
||||
+ quote)
|
||||
+ func_append func_quote_result "$3$2"
|
||||
+ set quote "$_G_part" "\\$_G_char"
|
||||
+ ;;
|
||||
+ start)
|
||||
+ set first "" ""
|
||||
+ func_quote_result=
|
||||
+ ;;
|
||||
+ first)
|
||||
+ set quote "$_G_part" ""
|
||||
+ ;;
|
||||
+ esac
|
||||
+ done
|
||||
+ IFS=$func_quote_old_IFS
|
||||
+ done
|
||||
+ ;;
|
||||
+ *) ;;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+
|
||||
# func_quote_for_eval ARG...
|
||||
# --------------------------
|
||||
# Aesthetically quote ARGs to be evaled later.
|
||||
@@ -1273,12 +1324,8 @@ func_quote_for_eval ()
|
||||
func_quote_for_eval_unquoted_result=
|
||||
func_quote_for_eval_result=
|
||||
while test 0 -lt $#; do
|
||||
- case $1 in
|
||||
- *[\\\`\"\$]*)
|
||||
- _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
|
||||
- *)
|
||||
- _G_unquoted_arg=$1 ;;
|
||||
- esac
|
||||
+ func_quote "$1"
|
||||
+ _G_unquoted_arg=$func_quote_result
|
||||
if test -n "$func_quote_for_eval_unquoted_result"; then
|
||||
func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
|
||||
else
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index 0c40da06..24acefd5 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -3346,7 +3346,8 @@ else
|
||||
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
||||
file=\"\$0\""
|
||||
|
||||
- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
|
||||
+ func_quote "$ECHO"
|
||||
+ qECHO=$func_quote_result
|
||||
$ECHO "\
|
||||
|
||||
# A function that is used when there is no print builtin or printf.
|
||||
@@ -8596,8 +8597,8 @@ EOF
|
||||
relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
|
||||
fi
|
||||
done
|
||||
- relink_command="(cd `pwd`; $relink_command)"
|
||||
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
|
||||
+ func_quote "(cd `pwd`; $relink_command)"
|
||||
+ relink_command=$func_quote_result
|
||||
fi
|
||||
|
||||
# Only actually do things if not in dry run mode.
|
||||
@@ -8843,7 +8844,8 @@ EOF
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
|
||||
+ func_quote "$relink_command"
|
||||
+ relink_command=$func_quote_result
|
||||
if test yes = "$hardcode_automatic"; then
|
||||
relink_command=
|
||||
fi
|
||||
diff --git a/build-aux/funclib.sh b/build-aux/funclib.sh
|
||||
index 39d972ed..47d8b95a 100644
|
||||
--- a/build-aux/funclib.sh
|
||||
+++ b/build-aux/funclib.sh
|
||||
@@ -1,5 +1,5 @@
|
||||
# Set a version string for this script.
|
||||
-scriptversion=2015-01-20.17; # UTC
|
||||
+scriptversion=2015-10-04.22; # UTC
|
||||
|
||||
# General shell script boiler plate, and helper functions.
|
||||
# Written by Gary V. Vaughan, 2004
|
||||
@@ -1026,6 +1026,57 @@ func_relative_path ()
|
||||
}
|
||||
|
||||
|
||||
+# func_quote ARG
|
||||
+# --------------
|
||||
+# Aesthetically quote one ARG, store the result into $func_quote_result. Note
|
||||
+# that we keep attention to performance here (so far O(N) complexity as long as
|
||||
+# func_append is O(1)).
|
||||
+func_quote ()
|
||||
+{
|
||||
+ $debug_cmd
|
||||
+
|
||||
+ func_quote_result=$1
|
||||
+
|
||||
+ case $func_quote_result in
|
||||
+ *[\\\`\"\$]*)
|
||||
+ case $func_quote_result in
|
||||
+ *[\[\*\?]*)
|
||||
+ func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"`
|
||||
+ return 0
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
+ func_quote_old_IFS=$IFS
|
||||
+ for _G_char in '\' '`' '"' '$'
|
||||
+ do
|
||||
+ # STATE($1) PREV($2) SEPARATOR($3)
|
||||
+ set start "" ""
|
||||
+ func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy
|
||||
+ IFS=$_G_char
|
||||
+ for _G_part in $func_quote_result
|
||||
+ do
|
||||
+ case $1 in
|
||||
+ quote)
|
||||
+ func_append func_quote_result "$3$2"
|
||||
+ set quote "$_G_part" "\\$_G_char"
|
||||
+ ;;
|
||||
+ start)
|
||||
+ set first "" ""
|
||||
+ func_quote_result=
|
||||
+ ;;
|
||||
+ first)
|
||||
+ set quote "$_G_part" ""
|
||||
+ ;;
|
||||
+ esac
|
||||
+ done
|
||||
+ IFS=$func_quote_old_IFS
|
||||
+ done
|
||||
+ ;;
|
||||
+ *) ;;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+
|
||||
# func_quote_for_eval ARG...
|
||||
# --------------------------
|
||||
# Aesthetically quote ARGs to be evaled later.
|
||||
@@ -1042,12 +1093,8 @@ func_quote_for_eval ()
|
||||
func_quote_for_eval_unquoted_result=
|
||||
func_quote_for_eval_result=
|
||||
while test 0 -lt $#; do
|
||||
- case $1 in
|
||||
- *[\\\`\"\$]*)
|
||||
- _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
|
||||
- *)
|
||||
- _G_unquoted_arg=$1 ;;
|
||||
- esac
|
||||
+ func_quote "$1"
|
||||
+ _G_unquoted_arg=$func_quote_result
|
||||
if test -n "$func_quote_for_eval_unquoted_result"; then
|
||||
func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
|
||||
else
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
From 16dbc070d32e6d4601cb5878dfdf69f2e29c84e1 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Raiskup <praiskup@redhat.com>
|
||||
Date: Mon, 5 Oct 2015 13:16:08 +0200
|
||||
Subject: [PATCH] libtool: optimizing options-parser hooks
|
||||
|
|
@ -27,16 +26,16 @@ return $EXIT_SUCCESS only if we changed something.
|
|||
(libtool_parse_options): Likewise.
|
||||
* bootstrap: Sync gl/build-aux/with option-parser.
|
||||
---
|
||||
bootstrap | 171 +++++++++++++++++++++++++++++++-------------
|
||||
build-aux/ltmain.in | 35 ++++++---
|
||||
gl/build-aux/options-parser | 171 +++++++++++++++++++++++++++++++-------------
|
||||
bootstrap | 171 +++++++++++++++++++++++++++++++++--------------
|
||||
build-aux/ltmain.in | 35 +++++++---
|
||||
build-aux/options-parser | 171 +++++++++++++++++++++++++++++++++--------------
|
||||
3 files changed, 271 insertions(+), 106 deletions(-)
|
||||
|
||||
diff --git a/bootstrap b/bootstrap
|
||||
index fe9e9cac..4f000965 100755
|
||||
index 17fb169..da84fe1 100755
|
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -1583,7 +1583,7 @@ func_lt_ver ()
|
||||
@@ -1536,7 +1536,7 @@ func_lt_ver ()
|
||||
#! /bin/sh
|
||||
|
||||
# Set a version string for this script.
|
||||
|
|
@ -45,7 +44,7 @@ index fe9e9cac..4f000965 100755
|
|||
|
||||
# A portable, pluggable option parser for Bourne shell.
|
||||
# Written by Gary V. Vaughan, 2010
|
||||
@@ -1743,6 +1743,8 @@ func_run_hooks ()
|
||||
@@ -1696,6 +1696,8 @@ func_run_hooks ()
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
|
|
@ -54,7 +53,7 @@ index fe9e9cac..4f000965 100755
|
|||
case " $hookable_fns " in
|
||||
*" $1 "*) ;;
|
||||
*) func_fatal_error "'$1' does not support hook funcions.n" ;;
|
||||
@@ -1751,16 +1753,16 @@ func_run_hooks ()
|
||||
@@ -1704,16 +1706,16 @@ func_run_hooks ()
|
||||
eval _G_hook_fns=\$$1_hooks; shift
|
||||
|
||||
for _G_hook in $_G_hook_fns; do
|
||||
|
|
@ -79,7 +78,7 @@ index fe9e9cac..4f000965 100755
|
|||
}
|
||||
|
||||
|
||||
@@ -1770,10 +1772,16 @@ func_run_hooks ()
|
||||
@@ -1723,10 +1725,16 @@ func_run_hooks ()
|
||||
## --------------- ##
|
||||
|
||||
# In order to add your own option parsing hooks, you must accept the
|
||||
|
|
@ -99,7 +98,7 @@ index fe9e9cac..4f000965 100755
|
|||
#
|
||||
# my_options_prep ()
|
||||
# {
|
||||
@@ -1783,9 +1791,11 @@ func_run_hooks ()
|
||||
@@ -1736,9 +1744,11 @@ func_run_hooks ()
|
||||
# usage_message=$usage_message'
|
||||
# -s, --silent don'\''t print informational messages
|
||||
# '
|
||||
|
|
@ -114,7 +113,7 @@ index fe9e9cac..4f000965 100755
|
|||
# }
|
||||
# func_add_hook func_options_prep my_options_prep
|
||||
#
|
||||
@@ -1794,25 +1804,37 @@ func_run_hooks ()
|
||||
@@ -1747,25 +1757,37 @@ func_run_hooks ()
|
||||
# {
|
||||
# $debug_cmd
|
||||
#
|
||||
|
|
@ -156,7 +155,7 @@ index fe9e9cac..4f000965 100755
|
|||
# }
|
||||
# func_add_hook func_parse_options my_silent_option
|
||||
#
|
||||
@@ -1824,16 +1846,32 @@ func_run_hooks ()
|
||||
@@ -1777,16 +1799,32 @@ func_run_hooks ()
|
||||
# $opt_silent && $opt_verbose && func_fatal_help "\
|
||||
# '--silent' and '--verbose' options are mutually exclusive."
|
||||
#
|
||||
|
|
@ -192,7 +191,7 @@ index fe9e9cac..4f000965 100755
|
|||
# func_options [ARG]...
|
||||
# ---------------------
|
||||
# All the functions called inside func_options are hookable. See the
|
||||
@@ -1843,17 +1881,28 @@ func_options ()
|
||||
@@ -1796,17 +1834,28 @@ func_options ()
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
|
|
@ -230,7 +229,7 @@ index fe9e9cac..4f000965 100755
|
|||
}
|
||||
|
||||
|
||||
@@ -1862,9 +1911,9 @@ func_options ()
|
||||
@@ -1815,9 +1864,9 @@ func_options ()
|
||||
# All initialisations required before starting the option parse loop.
|
||||
# Note that when calling hook functions, we pass through the list of
|
||||
# positional parameters. If a hook function modifies that list, and
|
||||
|
|
@ -242,7 +241,7 @@ index fe9e9cac..4f000965 100755
|
|||
func_hookable func_options_prep
|
||||
func_options_prep ()
|
||||
{
|
||||
@@ -1874,10 +1923,14 @@ func_options_prep ()
|
||||
@@ -1827,10 +1876,14 @@ func_options_prep ()
|
||||
opt_verbose=false
|
||||
opt_warning_types=
|
||||
|
||||
|
|
@ -260,7 +259,7 @@ index fe9e9cac..4f000965 100755
|
|||
}
|
||||
|
||||
|
||||
@@ -1891,18 +1944,20 @@ func_parse_options ()
|
||||
@@ -1844,18 +1897,20 @@ func_parse_options ()
|
||||
|
||||
func_parse_options_result=
|
||||
|
||||
|
|
@ -285,7 +284,7 @@ index fe9e9cac..4f000965 100755
|
|||
_G_opt=$1
|
||||
shift
|
||||
case $_G_opt in
|
||||
@@ -1917,7 +1972,10 @@ func_parse_options ()
|
||||
@@ -1870,7 +1925,10 @@ func_parse_options ()
|
||||
;;
|
||||
|
||||
--warnings|--warning|-W)
|
||||
|
|
@ -297,7 +296,7 @@ index fe9e9cac..4f000965 100755
|
|||
case " $warning_categories $1" in
|
||||
*" $1 "*)
|
||||
# trailing space prevents matching last $1 above
|
||||
@@ -1970,15 +2028,25 @@ func_parse_options ()
|
||||
@@ -1923,15 +1981,25 @@ func_parse_options ()
|
||||
shift
|
||||
;;
|
||||
|
||||
|
|
@ -328,7 +327,7 @@ index fe9e9cac..4f000965 100755
|
|||
}
|
||||
|
||||
|
||||
@@ -1991,16 +2059,21 @@ func_validate_options ()
|
||||
@@ -1944,16 +2012,21 @@ func_validate_options ()
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
|
|
@ -354,7 +353,7 @@ index fe9e9cac..4f000965 100755
|
|||
|
||||
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index 24acefd5..b4c6bcd6 100644
|
||||
index 0c40da0..ebc3a0e 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -358,6 +358,8 @@ libtool_options_prep ()
|
||||
|
|
@ -430,7 +429,7 @@ index 24acefd5..b4c6bcd6 100644
|
|||
func_add_hook func_parse_options libtool_parse_options
|
||||
|
||||
diff --git a/build-aux/options-parser b/build-aux/options-parser
|
||||
index d651f1d7..4c7e9cba 100644
|
||||
index d651f1d..4c7e9cb 100644
|
||||
--- a/build-aux/options-parser
|
||||
+++ b/build-aux/options-parser
|
||||
@@ -1,7 +1,7 @@
|
||||
|
|
@ -750,6 +749,3 @@ index d651f1d7..4c7e9cba 100644
|
|||
}
|
||||
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,3 @@
|
|||
From a3c6e99c9cde0f786fa3df88360c84cf33ddc278 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Raiskup <praiskup@redhat.com>
|
||||
Date: Sat, 31 Oct 2015 15:49:01 +0100
|
||||
Subject: [PATCH 15/20] syntax-check: fix sed syntax errors
|
||||
|
|
@ -21,10 +20,10 @@ use double quotes for sed's multi-line argument.
|
|||
cfg.mk | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
Index: libtool-2.4.6/cfg.mk
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/cfg.mk
|
||||
+++ libtool-2.4.6/cfg.mk
|
||||
diff --git a/cfg.mk b/cfg.mk
|
||||
index bdf4dd8..2249fd3 100644
|
||||
--- a/cfg.mk
|
||||
+++ b/cfg.mk
|
||||
@@ -70,9 +70,9 @@ local-checks-to-skip = \
|
||||
|
||||
# Check for correct usage of $cc_basename in libtool.m4.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
From a5c6466528c060cc4660ad0319c00740db0e42ba Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
|
||||
Date: Sun, 18 Oct 2015 21:55:39 -0700
|
||||
Subject: [PATCH 20/20] libtool: fix GCC/clang linking with -fsanitize=*
|
||||
|
|
@ -15,11 +14,11 @@ Copyright-paperwork-exempt: Yes
|
|||
build-aux/ltmain.in | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: libtool-2.4.6/build-aux/ltmain.in
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/build-aux/ltmain.in
|
||||
+++ libtool-2.4.6/build-aux/ltmain.in
|
||||
@@ -5382,10 +5382,11 @@ func_mode_link ()
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index ebc3a0e..caf9a76 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -5381,10 +5381,11 @@ func_mode_link ()
|
||||
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
|
||||
# -specs=* GCC specs files
|
||||
# -stdlib=* select c++ std lib with clang
|
||||
|
|
|
|||
|
|
@ -1,20 +1,24 @@
|
|||
Description: libtool: pass through -fuse-ld flags
|
||||
Starting with gcc-4.8, there's a -fuse-ld flag that can be used to
|
||||
select between bfd & gold. Make sure we pass it through to the
|
||||
linking stage.
|
||||
Author: Mike Frysinger <vapier@gentoo.org>
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: libtool: pass through -fuse-ld flags
|
||||
|
||||
Starting with gcc-4.8, there's a -fuse-ld flag that can be used to
|
||||
select between bfd & gold. Make sure we pass it through to the
|
||||
linking stage.
|
||||
Last-Updated: 2019-01-28
|
||||
Origin: http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=f9970d99293faf908fdc153a653fa5781095fb7a
|
||||
Bug-Debian: https://bugs.debian.orf/920529
|
||||
Forwarded: not-needed
|
||||
|
||||
* build-aux/ltmain.in (func_mode_link): Pass -fuse-ld=* flags
|
||||
through.
|
||||
---
|
||||
build-aux/ltmain.in | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: libtool-2.4.6/build-aux/ltmain.in
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/build-aux/ltmain.in
|
||||
+++ libtool-2.4.6/build-aux/ltmain.in
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index 2c9b246..fa13107 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -5382,10 +5382,11 @@ func_mode_link ()
|
||||
# -specs=* GCC specs files
|
||||
# -stdlib=* select c++ std lib with clang
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
Author: Alastair McKinstry <mckinstry@debian.org>
|
||||
Description: Support for Flang Fortran compiler
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: Support for Flang Fortran compiler
|
||||
|
||||
Last-Updated: 2019-02-18
|
||||
Forwarded: no
|
||||
---
|
||||
m4/libtool.m4 | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
Index: libtool-2.4.6/m4/libtool.m4
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/m4/libtool.m4
|
||||
+++ libtool-2.4.6/m4/libtool.m4
|
||||
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
||||
index c81e669..9d6dd9f 100644
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -4704,6 +4704,12 @@ m4_if([$1], [CXX], [
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
||||
|
|
|
|||
|
|
@ -1,13 +1,18 @@
|
|||
Description: Increment PREREQ needed for gnulib
|
||||
Author: Alastair McKinstry <mckinstry@debian.org>
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: Increment PREREQ needed for gnulib
|
||||
|
||||
Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948511
|
||||
Last-Updated: 2020-01-22
|
||||
Forwarded: no
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: libtool/configure.ac
|
||||
===================================================================
|
||||
--- libtool.orig/configure.ac
|
||||
+++ libtool/configure.ac
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 6c66f1e..b8bbbdd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -24,7 +24,7 @@
|
||||
####
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,21 @@
|
|||
Description: minor removal of unsafe shell script
|
||||
eval in these segements unnecessary
|
||||
Author: Alastair McKinstry <mckinstry@debian.org>
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: minor removal of unsafe shell script
|
||||
|
||||
eval in these segements unnecessary
|
||||
Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=866631
|
||||
Last-Updated: 2020-01-22
|
||||
Forwarded: no
|
||||
---
|
||||
build-aux/funclib.sh | 2 +-
|
||||
build-aux/ltmain.sh | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: libtool/build-aux/funclib.sh
|
||||
===================================================================
|
||||
--- libtool.orig/build-aux/funclib.sh
|
||||
+++ libtool/build-aux/funclib.sh
|
||||
@@ -322,7 +322,7 @@ EXIT_SKIP=77 # $? = 77 is used to indi
|
||||
diff --git a/build-aux/funclib.sh b/build-aux/funclib.sh
|
||||
index 39d972e..b4b1ba0 100644
|
||||
--- a/build-aux/funclib.sh
|
||||
+++ b/build-aux/funclib.sh
|
||||
@@ -322,7 +322,7 @@ EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
|
||||
# putting '$debug_cmd' at the start of all your functions, you can get
|
||||
# bash to show function call trace with:
|
||||
#
|
||||
|
|
@ -18,11 +24,11 @@ Index: libtool/build-aux/funclib.sh
|
|||
debug_cmd=${debug_cmd-":"}
|
||||
exit_cmd=:
|
||||
|
||||
Index: libtool/build-aux/ltmain.sh
|
||||
===================================================================
|
||||
--- libtool.orig/build-aux/ltmain.sh
|
||||
+++ libtool/build-aux/ltmain.sh
|
||||
@@ -387,7 +387,7 @@ EXIT_SKIP=77 # $? = 77 is used to indi
|
||||
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
|
||||
index 0f0a2da..12fb956 100644
|
||||
--- a/build-aux/ltmain.sh
|
||||
+++ b/build-aux/ltmain.sh
|
||||
@@ -387,7 +387,7 @@ EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
|
||||
# putting '$debug_cmd' at the start of all your functions, you can get
|
||||
# bash to show function call trace with:
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,14 +1,19 @@
|
|||
Description: documentation inconsitent with libltdl3
|
||||
Author: Alastair McKinstry <mckinstry@debian.org>
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: documentation inconsitent with libltdl3
|
||||
|
||||
Last-Updated: 2020-01-22
|
||||
Forwarded: no
|
||||
Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=253904
|
||||
---
|
||||
doc/libtool.texi | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: libtool-2.4.6/doc/libtool.texi
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/doc/libtool.texi
|
||||
+++ libtool-2.4.6/doc/libtool.texi
|
||||
@@ -3956,10 +3956,10 @@ portability you should try to ensure tha
|
||||
diff --git a/doc/libtool.texi b/doc/libtool.texi
|
||||
index 0298627..52b2f48 100644
|
||||
--- a/doc/libtool.texi
|
||||
+++ b/doc/libtool.texi
|
||||
@@ -3956,10 +3956,10 @@ portability you should try to ensure that you only pass
|
||||
@option{-module} flag.}.
|
||||
|
||||
Unresolved symbols in the module are resolved using its dependency
|
||||
|
|
|
|||
|
|
@ -1,10 +1,17 @@
|
|||
Description: Pass more flags to the linker unchanged. Closes: #751161.
|
||||
Author: Vincent Lefevre <vincent@vinc17.net>
|
||||
Last-Updated: 2019-05-03
|
||||
From: Vincent Lefevre <vincent@vinc17.net>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: Pass more flags to the linker unchanged. Closes: #751161.
|
||||
|
||||
--- libtool-2.4.6-a/build-aux/ltmain.in 2019-05-03 11:11:05.000000000 +0200
|
||||
+++ libtool-2.4.6-b/build-aux/ltmain.in 2019-05-03 11:18:59.209409497 +0200
|
||||
@@ -5383,10 +5383,12 @@
|
||||
Last-Updated: 2019-05-03
|
||||
---
|
||||
build-aux/ltmain.in | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index fa13107..b0c8722 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -5383,10 +5383,12 @@ func_mode_link ()
|
||||
# -stdlib=* select c++ std lib with clang
|
||||
# -fsanitize=* Clang/GCC memory and address sanitizer
|
||||
# -fuse-ld=* Linker select flags for GCC
|
||||
|
|
|
|||
|
|
@ -1,14 +1,39 @@
|
|||
Description: Change default AR flags to 'cr' to silence warning
|
||||
over default 'D' overriding 'u'
|
||||
Author: Alastair McKinstry <mckinstry@debian.org>
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: Change default AR flags to 'cr' to silence warning
|
||||
|
||||
over default 'D' overriding 'u'
|
||||
Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=864018
|
||||
Last-Updated: 2020-02-04
|
||||
Forwarded: no
|
||||
---
|
||||
m4/gnulib-common.m4 | 4 ++--
|
||||
m4/libtool.m4 | 6 +++---
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: libtool-2.4.6/m4/libtool.m4
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/m4/libtool.m4
|
||||
+++ libtool-2.4.6/m4/libtool.m4
|
||||
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
|
||||
index b301abe..40e82f6 100644
|
||||
--- a/m4/gnulib-common.m4
|
||||
+++ b/m4/gnulib-common.m4
|
||||
@@ -278,12 +278,12 @@ Amsterdam
|
||||
dnl but prefer ${host}-ar over ar (useful for cross-compiling).
|
||||
AC_CHECK_TOOL([AR], [ar], [ar])
|
||||
if test -z "$ARFLAGS"; then
|
||||
- ARFLAGS='cru'
|
||||
+ ARFLAGS='cr'
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test -z "$ARFLAGS"; then
|
||||
- ARFLAGS='cru'
|
||||
+ ARFLAGS='cr'
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([AR])
|
||||
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
||||
index 9d6dd9f..a6d21ae 100644
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;}
|
||||
_LT_EOF
|
||||
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
|
||||
|
|
@ -29,22 +54,3 @@ Index: libtool-2.4.6/m4/libtool.m4
|
|||
_LT_DECL([], [AR], [1], [The archiver])
|
||||
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
|
||||
|
||||
Index: libtool-2.4.6/m4/gnulib-common.m4
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/m4/gnulib-common.m4
|
||||
+++ libtool-2.4.6/m4/gnulib-common.m4
|
||||
@@ -278,12 +278,12 @@ Amsterdam
|
||||
dnl but prefer ${host}-ar over ar (useful for cross-compiling).
|
||||
AC_CHECK_TOOL([AR], [ar], [ar])
|
||||
if test -z "$ARFLAGS"; then
|
||||
- ARFLAGS='cru'
|
||||
+ ARFLAGS='cr'
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test -z "$ARFLAGS"; then
|
||||
- ARFLAGS='cru'
|
||||
+ ARFLAGS='cr'
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([AR])
|
||||
|
|
|
|||
|
|
@ -1,7 +1,16 @@
|
|||
Index: libtool-2.4.6/bootstrap.conf
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: bootstrap_options.conf
|
||||
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/bootstrap.conf
|
||||
+++ libtool-2.4.6/bootstrap.conf
|
||||
---
|
||||
bootstrap.conf | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/bootstrap.conf b/bootstrap.conf
|
||||
index 793d368..131710f 100644
|
||||
--- a/bootstrap.conf
|
||||
+++ b/bootstrap.conf
|
||||
@@ -70,8 +70,6 @@ gnulib_modules='
|
||||
do-release-commit-and-tag
|
||||
extract-trace
|
||||
|
|
|
|||
|
|
@ -1,8 +1,17 @@
|
|||
Index: libtool-2.4.6/build-aux/ltmain.in
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:41 +0800
|
||||
Subject: deplib_binary
|
||||
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/build-aux/ltmain.in
|
||||
+++ libtool-2.4.6/build-aux/ltmain.in
|
||||
@@ -6001,19 +6001,19 @@ func_mode_link ()
|
||||
---
|
||||
build-aux/ltmain.in | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index 98cb7ae..cd7e946 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -6000,19 +6000,19 @@ func_mode_link ()
|
||||
# It is a libtool convenience library, so add in its objects.
|
||||
func_append convenience " $ladir/$objdir/$old_library"
|
||||
func_append old_convenience " $ladir/$objdir/$old_library"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,17 @@
|
|||
Index: libtool-2.2.10/tests/deplibs-ident.at
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: deplibs-ident
|
||||
|
||||
===================================================================
|
||||
--- libtool-2.2.10.orig/tests/deplibs-ident.at 2010-06-17 18:36:59.000000000 +0000
|
||||
+++ libtool-2.2.10/tests/deplibs-ident.at 2010-06-17 18:39:32.000000000 +0000
|
||||
@@ -66,13 +66,6 @@
|
||||
---
|
||||
tests/deplibs-ident.at | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/tests/deplibs-ident.at b/tests/deplibs-ident.at
|
||||
index b59fb28..c47ef02 100644
|
||||
--- a/tests/deplibs-ident.at
|
||||
+++ b/tests/deplibs-ident.at
|
||||
@@ -67,13 +67,6 @@ int main() { return a1() + a2() + a3() + c(); }
|
||||
AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o b$EXEEXT b.$OBJEXT ../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere],
|
||||
[0],[stdout],[ignore])
|
||||
AT_CHECK([$EGREP 'cee.*cee' stdout], 1, [ignore], [ignore])
|
||||
|
|
|
|||
|
|
@ -1,15 +1,23 @@
|
|||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: deplibs_test_disable
|
||||
|
||||
## This test is broken for several reasons:
|
||||
## This test is broken for several reasons:
|
||||
## - It's linking a shared lib against a static lib. This is not
|
||||
## portable, and we even give a warning about this.
|
||||
## - The shared lib is not using any symbols from the static lib.
|
||||
## - The test program is linked against the shared lib and using
|
||||
## symbols from the static lib.
|
||||
---
|
||||
tests/demo.at | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
Index: libtool-2.2.6a/tests/demo.at
|
||||
===================================================================
|
||||
--- libtool-2.2.6a.orig/tests/demo.at 2009-04-10 00:53:38.000000000 +0200
|
||||
+++ libtool-2.2.6a/tests/demo.at 2009-04-10 00:53:48.000000000 +0200
|
||||
@@ -436,6 +436,8 @@
|
||||
diff --git a/tests/demo.at b/tests/demo.at
|
||||
index 28a2801..548a88b 100644
|
||||
--- a/tests/demo.at
|
||||
+++ b/tests/demo.at
|
||||
@@ -436,6 +436,8 @@ AT_CLEANUP
|
||||
|
||||
AT_SETUP([deplibs_check_method])
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,17 @@
|
|||
Index: b/tests/link-order2.at
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: disable-link-order2
|
||||
|
||||
===================================================================
|
||||
---
|
||||
tests/link-order2.at | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/tests/link-order2.at b/tests/link-order2.at
|
||||
index 7e48d76..c86cd75 100644
|
||||
--- a/tests/link-order2.at
|
||||
+++ b/tests/link-order2.at
|
||||
@@ -47,6 +47,8 @@
|
||||
@@ -47,6 +47,8 @@ AT_SETUP([Link order of deplibs])
|
||||
AT_KEYWORDS([libtool])
|
||||
AT_KEYWORDS([interactive])dnl running 'wrong' may cause a popup window.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,20 @@
|
|||
Description: Add spaces before -L in Grep searches
|
||||
Current searching for "-L" in link paths is over-greedy and incorrectly handles paths with -L in them
|
||||
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=896861 for example
|
||||
Author: Alastair McKinstry <mckinstry@debian.org>
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: Add spaces before -L in Grep searches
|
||||
|
||||
Current searching for "-L" in link paths is over-greedy and incorrectly handles paths with -L in them
|
||||
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=896861 for example
|
||||
Last-Updated: 2018-09-08
|
||||
Forwarded: no
|
||||
---
|
||||
m4/libtool.m4 | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
Index: libtool-2.4.6/m4/libtool.m4
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/m4/libtool.m4
|
||||
+++ libtool-2.4.6/m4/libtool.m4
|
||||
@@ -6438,7 +6438,7 @@ if test yes != "$_lt_caught_CXX_error";
|
||||
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
||||
index ee80844..e67ed69 100644
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -6438,7 +6438,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
|
|
@ -18,7 +23,7 @@ Index: libtool-2.4.6/m4/libtool.m4
|
|||
|
||||
else
|
||||
GXX=no
|
||||
@@ -6813,7 +6813,7 @@ if test yes != "$_lt_caught_CXX_error";
|
||||
@@ -6813,7 +6813,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
|
|
@ -27,7 +32,7 @@ Index: libtool-2.4.6/m4/libtool.m4
|
|||
;;
|
||||
*)
|
||||
if test yes = "$GXX"; then
|
||||
@@ -6878,7 +6878,7 @@ if test yes != "$_lt_caught_CXX_error";
|
||||
@@ -6878,7 +6878,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
|
|
@ -36,7 +41,7 @@ Index: libtool-2.4.6/m4/libtool.m4
|
|||
;;
|
||||
*)
|
||||
if test yes = "$GXX"; then
|
||||
@@ -7217,7 +7217,7 @@ if test yes != "$_lt_caught_CXX_error";
|
||||
@@ -7217,7 +7217,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
|
|
@ -45,7 +50,7 @@ Index: libtool-2.4.6/m4/libtool.m4
|
|||
|
||||
else
|
||||
# FIXME: insert proper C++ library support
|
||||
@@ -7301,7 +7301,7 @@ if test yes != "$_lt_caught_CXX_error";
|
||||
@@ -7301,7 +7301,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
|
|
@ -54,7 +59,7 @@ Index: libtool-2.4.6/m4/libtool.m4
|
|||
else
|
||||
# g++ 2.7 appears to require '-G' NOT '-shared' on this
|
||||
# platform.
|
||||
@@ -7312,7 +7312,7 @@ if test yes != "$_lt_caught_CXX_error";
|
||||
@@ -7312,7 +7312,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
Ensure that $(LIBLTDL) is built first
|
||||
|
||||
After Automake upstream commit f4e91bfc490d, the list in 'all-am:' is
|
||||
reordered for this test-case (*_LTLIBRARIES is before *_PROGRAMS), which
|
||||
means that linker will fail to link 'old' binary.
|
||||
|
||||
Previously (with automake <= 1.16), it was matter of luck -- it worked if
|
||||
(a) the build was serial (-j1), and/or (b) libtool-ltdl-devel package was
|
||||
installed on the box so ./configure picked the system version of libltdl.
|
||||
|
||||
Users should anyways use system's ltdl, so this has low priority.
|
||||
|
||||
diff --git a/tests/old-ltdl-iface.at b/tests/old-ltdl-iface.at
|
||||
index cee29089..6f9c8001 100644
|
||||
--- a/tests/old-ltdl-iface.at
|
||||
+++ b/tests/old-ltdl-iface.at
|
||||
@@ -62,6 +62,9 @@ MOSTLYCLEANFILES =
|
||||
include ltdl/Makefile.inc
|
||||
bin_PROGRAMS = old
|
||||
old_LDADD = -Lltdl $(LIBLTDL)
|
||||
+# TODO: if --with-included-ltdl was unused this would
|
||||
+# generate useless dependency.
|
||||
+old_DEPENDENCIES = $(LIBLTDL)
|
||||
]])
|
||||
|
||||
AT_DATA([old.c],
|
||||
@@ -131,7 +134,7 @@ LT_AT_CHECK_LIBTOOLIZE([--ltdl=ltdl --nonrecursive --install], 0, [expout], [exp
|
||||
|
||||
AT_CHECK([test -f ltdl/Makefile.inc])
|
||||
|
||||
-LT_AT_BOOTSTRAP([ignore], [-I m4], [], [--add-missing], [--force])
|
||||
+LT_AT_BOOTSTRAP([ignore], [-I m4], [], [--add-missing], [--force], [--with-included-ltdl])
|
||||
|
||||
LT_AT_EXEC_CHECK([./old], 0, [[...]])
|
||||
|
||||
|
|
@ -1,21 +1,26 @@
|
|||
Description: Avoid a broken AC_TRY_EVAL macro
|
||||
As said in the Autoconf source, the AC_TRY_EVAL macro is dangerous and
|
||||
undocumented, and should not be used.
|
||||
In particular, the one related to nm yields binary data in the config.log
|
||||
file with dash, where "echo \\1" (echo with the argument \1) produces the
|
||||
control character ^A instead of the usual \1 with most shells (POSIX says
|
||||
that the result is implementation-defined). See:
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910076
|
||||
This patch attempts to replace this AC_TRY_EVAL occurrence by code with
|
||||
similar behavior, but using $ECHO instead of echo in order to avoid the
|
||||
backslash issue.
|
||||
Author: Vincent Lefevre <vincent@vinc17.net>
|
||||
Last-Updated: 2018-10-02
|
||||
From: Vincent Lefevre <vincent@vinc17.net>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: Avoid a broken AC_TRY_EVAL macro
|
||||
|
||||
Index: libtool-2.4.6/m4/libtool.m4
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/m4/libtool.m4
|
||||
+++ libtool-2.4.6/m4/libtool.m4
|
||||
As said in the Autoconf source, the AC_TRY_EVAL macro is dangerous and
|
||||
undocumented, and should not be used.
|
||||
In particular, the one related to nm yields binary data in the config.log
|
||||
file with dash, where "echo \\1" (echo with the argument \1) produces the
|
||||
control character ^A instead of the usual \1 with most shells (POSIX says
|
||||
that the result is implementation-defined). See:
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910076
|
||||
This patch attempts to replace this AC_TRY_EVAL occurrence by code with
|
||||
similar behavior, but using $ECHO instead of echo in order to avoid the
|
||||
backslash issue.
|
||||
Last-Updated: 2018-10-02
|
||||
---
|
||||
m4/libtool.m4 | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
||||
index e67ed69..c81e669 100644
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -4063,7 +4063,8 @@ _LT_EOF
|
||||
if AC_TRY_EVAL(ac_compile); then
|
||||
# Now try to grab the symbols.
|
||||
|
|
@ -26,4 +31,3 @@ Index: libtool-2.4.6/m4/libtool.m4
|
|||
# Try sorting and uniquifying the output.
|
||||
if sort "$nlist" | uniq > "$nlist"T; then
|
||||
mv -f "$nlist"T "$nlist"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,21 @@
|
|||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:41 +0800
|
||||
Subject: link_all_deplibs
|
||||
|
||||
## Do not link against deplibs. This is not needed for shared libs
|
||||
## on atleast ELF systems since those already know which libs they
|
||||
## need themself. This seems to break a few things and will be fixed
|
||||
## in a better way in a future upstream version.
|
||||
---
|
||||
build-aux/ltmain.in | 5 ++++-
|
||||
m4/libtool.m4 | 7 +++++++
|
||||
2 files changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: libtool-2.4.6/build-aux/ltmain.in
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/build-aux/ltmain.in
|
||||
+++ libtool-2.4.6/build-aux/ltmain.in
|
||||
@@ -5679,7 +5679,10 @@ func_mode_link ()
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index caf9a76..98cb7ae 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -5678,7 +5678,10 @@ func_mode_link ()
|
||||
case $pass in
|
||||
dlopen) libs=$dlfiles ;;
|
||||
dlpreopen) libs=$dlprefiles ;;
|
||||
|
|
@ -19,10 +27,10 @@ Index: libtool-2.4.6/build-aux/ltmain.in
|
|||
esac
|
||||
fi
|
||||
if test lib,dlpreopen = "$linkmode,$pass"; then
|
||||
Index: libtool-2.4.6/m4/libtool.m4
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/m4/libtool.m4
|
||||
+++ libtool-2.4.6/m4/libtool.m4
|
||||
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
||||
index a3bc337..a2c7a84 100644
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -4936,6 +4936,9 @@ m4_if([$1], [CXX], [
|
||||
;;
|
||||
esac
|
||||
|
|
@ -33,7 +41,7 @@ Index: libtool-2.4.6/m4/libtool.m4
|
|||
*)
|
||||
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
;;
|
||||
@@ -4998,6 +5001,9 @@ dnl Note also adjust exclude_expsyms for
|
||||
@@ -4998,6 +5001,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
||||
openbsd* | bitrig*)
|
||||
with_gnu_ld=no
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,17 @@
|
|||
Index: b/Makefile.am
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: man-add-whatis-info
|
||||
|
||||
===================================================================
|
||||
---
|
||||
Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 13dfc63..6a13f72 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -417,9 +417,9 @@
|
||||
@@ -417,9 +417,9 @@ update_mans = \
|
||||
# manual pages if the sources for the build-tree files we want to
|
||||
# run have changed.
|
||||
$(libtool_1): $(ltmain_sh)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,18 @@
|
|||
## Add support for netbsdelf*-gnu
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: netbsdelf
|
||||
|
||||
Index: b/m4/libtool.m4
|
||||
===================================================================
|
||||
## Add support for netbsdelf*-gnu
|
||||
---
|
||||
m4/libtool.m4 | 20 ++++++++++++++++----
|
||||
m4/ltdl.m4 | 2 +-
|
||||
2 files changed, 17 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
||||
index a2c7a84..10ab284 100644
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -2887,6 +2887,18 @@
|
||||
@@ -2887,6 +2887,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
||||
dynamic_linker='GNU/Linux ld.so'
|
||||
;;
|
||||
|
||||
|
|
@ -23,7 +31,7 @@ Index: b/m4/libtool.m4
|
|||
netbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
@@ -3546,7 +3558,7 @@
|
||||
@@ -3546,7 +3558,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
|
|
@ -32,7 +40,7 @@ Index: b/m4/libtool.m4
|
|||
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
|
||||
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
|
||||
else
|
||||
@@ -4424,7 +4436,7 @@
|
||||
@@ -4424,7 +4436,7 @@ m4_if([$1], [CXX], [
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -41,7 +49,7 @@ Index: b/m4/libtool.m4
|
|||
;;
|
||||
*qnx* | *nto*)
|
||||
# QNX uses GNU C++, but need to define -shared option too, otherwise
|
||||
@@ -5258,7 +5270,7 @@
|
||||
@@ -5258,7 +5270,7 @@ _LT_EOF
|
||||
fi
|
||||
;;
|
||||
|
||||
|
|
@ -50,7 +58,7 @@ Index: b/m4/libtool.m4
|
|||
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
||||
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
||||
wlarc=
|
||||
@@ -5801,7 +5813,7 @@
|
||||
@@ -5801,7 +5813,7 @@ _LT_EOF
|
||||
esac
|
||||
;;
|
||||
|
||||
|
|
@ -59,11 +67,11 @@ Index: b/m4/libtool.m4
|
|||
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
||||
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
||||
else
|
||||
Index: b/m4/ltdl.m4
|
||||
===================================================================
|
||||
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
|
||||
index bde587a..560522a 100644
|
||||
--- a/m4/ltdl.m4
|
||||
+++ b/m4/ltdl.m4
|
||||
@@ -496,7 +496,7 @@
|
||||
@@ -496,7 +496,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
|
||||
# at 6.2 and later dlopen does load deplibs.
|
||||
lt_cv_sys_dlopen_deplibs=yes
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,16 @@
|
|||
Index: libtool-2.4.6/m4/libtool.m4
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: no_hostname
|
||||
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/m4/libtool.m4
|
||||
+++ libtool-2.4.6/m4/libtool.m4
|
||||
---
|
||||
m4/libtool.m4 | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
||||
index 10ab284..ee80844 100644
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
|
||||
cat <<_LT_EOF >> "$cfgfile"
|
||||
#! $SHELL
|
||||
|
|
|
|||
|
|
@ -1,8 +1,17 @@
|
|||
Index: libtool-2.2.6a/tests/demo.at
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: nopic
|
||||
|
||||
===================================================================
|
||||
--- libtool-2.2.6a.orig/tests/demo.at 2008-11-18 21:11:29.000000000 +0000
|
||||
+++ libtool-2.2.6a/tests/demo.at 2008-11-18 21:12:41.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
---
|
||||
tests/demo.at | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/demo.at b/tests/demo.at
|
||||
index 7c6f5dc..28a2801 100644
|
||||
--- a/tests/demo.at
|
||||
+++ b/tests/demo.at
|
||||
@@ -510,7 +510,7 @@ AT_CLEANUP
|
||||
AT_SETUP([force non-PIC objects])
|
||||
|
||||
AT_CHECK([case $host in
|
||||
|
|
@ -11,4 +20,3 @@ Index: libtool-2.2.6a/tests/demo.at
|
|||
# These hosts cannot use non-PIC shared libs
|
||||
exit 77 ;;
|
||||
*-solaris*|*-sunos*)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
0001-libtool-fix-GCC-linking-with-specs.patch
|
||||
0003-libtoolize-fix-infinite-recursion-in-m4.patch
|
||||
# 0010-libtool-mitigate-the-sed_quote_subst-slowdown.patch
|
||||
0011-libtool-optimizing-options-parser-hooks.patch
|
||||
# 0012-funclib-refactor-quoting-methods-a-bit.patch
|
||||
0015-syntax-check-fix-sed-syntax-errors.patch
|
||||
0020-libtool-fix-GCC-clang-linking-with-fsanitize.patch
|
||||
link_all_deplibs.patch
|
||||
|
|
|
|||
|
|
@ -1,20 +1,17 @@
|
|||
Index: libtool-2.4.6/libtoolize.in
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: version_string
|
||||
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/libtoolize.in
|
||||
+++ libtool-2.4.6/libtoolize.in
|
||||
@@ -114,7 +114,7 @@ When reporting a bug, please describe a
|
||||
include the following information:
|
||||
|
||||
host-triplet: @host_triplet@
|
||||
- version: $progname (GNU @PACKAGE@) @VERSION@
|
||||
+ version: $progname $scriptversion
|
||||
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
||||
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
||||
|
||||
Index: libtool-2.4.6/build-aux/ltmain.in
|
||||
===================================================================
|
||||
--- libtool-2.4.6.orig/build-aux/ltmain.in
|
||||
+++ libtool-2.4.6/build-aux/ltmain.in
|
||||
---
|
||||
build-aux/ltmain.in | 2 +-
|
||||
libtoolize.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index 8c119f1..2c9b246 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -156,7 +156,7 @@ include the following information:
|
||||
compiler: $LTCC
|
||||
compiler flags: $LTCFLAGS
|
||||
|
|
@ -24,3 +21,16 @@ Index: libtool-2.4.6/build-aux/ltmain.in
|
|||
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
||||
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
||||
|
||||
diff --git a/libtoolize.in b/libtoolize.in
|
||||
index 798bd0a..766f7d1 100644
|
||||
--- a/libtoolize.in
|
||||
+++ b/libtoolize.in
|
||||
@@ -114,7 +114,7 @@ When reporting a bug, please describe a test case to reproduce it and
|
||||
include the following information:
|
||||
|
||||
host-triplet: @host_triplet@
|
||||
- version: $progname (GNU @PACKAGE@) @VERSION@
|
||||
+ version: $progname $scriptversion
|
||||
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
||||
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,17 @@
|
|||
Index: b/build-aux/ltmain.in
|
||||
From: Alastair McKinstry <mckinstry@debian.org>
|
||||
Date: Sat, 14 May 2022 01:23:42 +0800
|
||||
Subject: version_type
|
||||
|
||||
===================================================================
|
||||
---
|
||||
build-aux/ltmain.in | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index cd7e946..8c119f1 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -8826,6 +8826,9 @@
|
||||
@@ -6936,6 +6936,9 @@ func_mode_link ()
|
||||
revision=$number_minor
|
||||
lt_irix_increment=no
|
||||
;;
|
||||
|
|
|
|||
Loading…
Reference in New Issue