[toolchain] add support for gcc v4.3.1 & v4.3.2 (closes: #3479), thanks to Luigi...
[openwrt/svn-archive/archive.git] / toolchain / gcc / patches / 4.3.1 / 105-libtool.patch
1 2008-03-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
2
3 Backport from upstream Libtool:
4
5 2007-10-12 Eric Blake <ebb9@byu.net>
6
7 Deal with Autoconf 2.62's semantic change in m4_append.
8 * ltsugar.m4 (lt_append): Replace broken versions of
9 m4_append.
10 (lt_if_append_uniq): Don't require separator to be overquoted, and
11 avoid broken m4_append.
12 (lt_dict_add): Fix typo.
13 * libtool.m4 (_LT_DECL): Don't overquote separator.
14
15 diff --git a/libtool.m4 b/libtool.m4
16 index e86cd02..26a039a 100644
17 --- a/libtool.m4
18 +++ b/libtool.m4
19 @@ -319,7 +319,7 @@ m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
20 # VALUE may be 0, 1 or 2 for a computed quote escaped value based on
21 # VARNAME. Any other value will be used directly.
22 m4_define([_LT_DECL],
23 -[lt_if_append_uniq([lt_decl_varnames], [$2], [[, ]],
24 +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
25 [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
26 [m4_ifval([$1], [$1], [$2])])
27 lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
28 diff --git a/ltsugar.m4 b/ltsugar.m4
29 index fc51dc7..dd4f871 100644
30 --- a/ltsugar.m4
31 +++ b/ltsugar.m4
32 @@ -1,13 +1,13 @@
33 # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
34 #
35 -# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
36 +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
37 # Written by Gary V. Vaughan.
38 #
39 # This file is free software; the Free Software Foundation gives
40 # unlimited permission to copy and/or distribute it, with or without
41 # modifications, as long as this notice is preserved.
42
43 -# serial 3 ltsugar.m4
44 +# serial 4 ltsugar.m4
45
46 # This is to help aclocal find these macros, as it can't see m4_define.
47 AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
48 @@ -46,6 +46,20 @@ m4_define([lt_cdr],
49 m4_define([lt_unquote], $1)
50
51
52 +# lt_append(MACRO-NAME, STRING, [SEPARATOR])
53 +# ------------------------------------------
54 +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
55 +# Note that neither SEPARATOR nor STRING are expanded. No SEPARATOR is
56 +# output if MACRO-NAME was previously undefined (different than defined
57 +# and empty).
58 +# This macro is needed until we can rely on Autoconf 2.62, since earlier
59 +# versions of m4 mistakenly expanded SEPARATOR.
60 +m4_define([lt_append],
61 +[m4_define([$1],
62 + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
63 +
64 +
65 +
66 # lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
67 # ----------------------------------------------------------
68 # Produce a SEP delimited list of all paired combinations of elements of
69 @@ -67,10 +81,10 @@ m4_define([lt_combine],
70 # by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
71 m4_define([lt_if_append_uniq],
72 [m4_ifdef([$1],
73 - [m4_bmatch($3[]m4_defn([$1])$3, $3[]m4_re_escape([$2])$3,
74 - [$5],
75 - [m4_append([$1], [$2], [$3])$4])],
76 - [m4_append([$1], [$2], [$3])$4])])
77 + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
78 + [lt_append([$1], [$2], [$3])$4],
79 + [$5])],
80 + [lt_append([$1], [$2], [$3])$4])])
81
82
83 # lt_dict_add(DICT, KEY, VALUE)
84