diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-06 14:47:37 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:36:26 +0000 |
commit | d4e1862453b2a4c12400de0f43f08a9871a4de60 (patch) | |
tree | a79c7e99aec47a61d3d37074e5a335e6d7bd2fd8 /meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch | |
parent | d97787346347526d163d0de69222bff2e7b25408 (diff) | |
download | poky-d4e1862453b2a4c12400de0f43f08a9871a4de60.tar.gz |
libtool: upgraded to 2.4.4
* Upgrade:
- libtool-native
- libtool-cross
- nativesdk-libtool
- libtool
* Remove 2 patches:
- respect-fstack-protector.patch: already in the new source.
- avoid_absolute_paths_for_general_utils.patch: no general.m4sh any
more.
- Use inline-source to install libtoolize.
* Update other patches
* The LIC_FILES_CHKSUM is changed because of the indent, the contents
are the same.
* The libtool config files are put in libtool/build-aux now, it was
libtool/config in the past.
(From OE-Core rev: 871dc461b1dfc431c0c95743af1624b781262bce)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch index c3e3e867aa..ad2b110530 100644 --- a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch +++ b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch | |||
@@ -10,29 +10,31 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html | |||
10 | 10 | ||
11 | -Khem Raj <raj.khem@gmail.com> | 11 | -Khem Raj <raj.khem@gmail.com> |
12 | 12 | ||
13 | Index: libtool-2.4.2/libltdl/m4/libtool.m4 | 13 | Updated by: Robert Yang <liezhi.yang@windriver.com> |
14 | =================================================================== | 14 | |
15 | --- libtool-2.4.2.orig/libltdl/m4/libtool.m4 | 15 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
16 | +++ libtool-2.4.2/libltdl/m4/libtool.m4 | 16 | --- a/m4/libtool.m4 |
17 | @@ -1224,27 +1224,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr | 17 | +++ b/m4/libtool.m4 |
18 | @@ -1215,28 +1215,28 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) | ||
18 | # ---------------- | 19 | # ---------------- |
19 | AC_DEFUN([_LT_WITH_SYSROOT], | 20 | AC_DEFUN([_LT_WITH_SYSROOT], |
20 | [AC_MSG_CHECKING([for sysroot]) | 21 | [AC_MSG_CHECKING([for sysroot]) |
21 | -AC_ARG_WITH([sysroot], | 22 | -AC_ARG_WITH([sysroot], |
22 | -[ --with-sysroot[=DIR] Search for dependent libraries within DIR | 23 | -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], |
23 | +AC_ARG_WITH([libtool-sysroot], | 24 | +AC_ARG_WITH([libtool-sysroot], |
24 | +[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR | 25 | +[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@], |
25 | (or the compiler's sysroot if not specified).], | 26 | [Search for dependent libraries within DIR (or the compiler's sysroot |
27 | if not specified).])], | ||
26 | -[], [with_sysroot=no]) | 28 | -[], [with_sysroot=no]) |
27 | +[], [with_libtool_sysroot=no]) | 29 | +[], [with_libtool_sysroot=no]) |
28 | 30 | ||
29 | dnl lt_sysroot will always be passed unquoted. We quote it here | 31 | dnl lt_sysroot will always be passed unquoted. We quote it here |
30 | dnl in case the user passed a directory name. | 32 | dnl in case the user passed a directory name. |
31 | lt_sysroot= | 33 | lt_sysroot= |
32 | -case ${with_sysroot} in #( | 34 | -case $with_sysroot in #( |
33 | +case ${with_libtool_sysroot} in #( | 35 | +case $with_libtool_sysroot in #( |
34 | yes) | 36 | yes) |
35 | if test "$GCC" = yes; then | 37 | if test yes = "$GCC"; then |
36 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` | 38 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
37 | fi | 39 | fi |
38 | ;; #( | 40 | ;; #( |
@@ -43,15 +45,14 @@ Index: libtool-2.4.2/libltdl/m4/libtool.m4 | |||
43 | no|'') | 45 | no|'') |
44 | ;; #( | 46 | ;; #( |
45 | *) | 47 | *) |
46 | - AC_MSG_RESULT([${with_sysroot}]) | 48 | - AC_MSG_RESULT([$with_sysroot]) |
47 | + AC_MSG_RESULT([${with_libtool_sysroot}]) | 49 | + AC_MSG_RESULT([$with_libtool_sysroot]) |
48 | AC_MSG_ERROR([The sysroot must be an absolute path.]) | 50 | AC_MSG_ERROR([The sysroot must be an absolute path.]) |
49 | ;; | 51 | ;; |
50 | esac | 52 | esac |
51 | Index: libtool-2.4.2/tests/sysroot.at | 53 | diff --git a/tests/sysroot.at b/tests/sysroot.at |
52 | =================================================================== | 54 | --- a/tests/sysroot.at |
53 | --- libtool-2.4.2.orig/tests/sysroot.at | 55 | +++ b/tests/sysroot.at |
54 | +++ libtool-2.4.2/tests/sysroot.at | ||
55 | @@ -64,7 +64,7 @@ while read file; do | 56 | @@ -64,7 +64,7 @@ while read file; do |
56 | done]) | 57 | done]) |
57 | 58 | ||
@@ -60,7 +61,7 @@ Index: libtool-2.4.2/tests/sysroot.at | |||
60 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" | 61 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" |
61 | 62 | ||
62 | #??? | 63 | #??? |
63 | if test "$shlibpath_var" = PATH; then | 64 | if test PATH = "$shlibpath_var"; then |
64 | @@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign]) | 65 | @@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign]) |
65 | AC_PROG_CC | 66 | AC_PROG_CC |
66 | AC_CONFIG_SRCDIR([lib2.c]) | 67 | AC_CONFIG_SRCDIR([lib2.c]) |
@@ -79,11 +80,10 @@ Index: libtool-2.4.2/tests/sysroot.at | |||
79 | AC_SUBST([sysroot]) | 80 | AC_SUBST([sysroot]) |
80 | AC_OUTPUT(Makefile) | 81 | AC_OUTPUT(Makefile) |
81 | ]]) | 82 | ]]) |
82 | Index: libtool-2.4.2/tests/testsuite | 83 | diff --git a/tests/testsuite b/tests/testsuite |
83 | =================================================================== | 84 | --- a/tests/testsuite |
84 | --- libtool-2.4.2.orig/tests/testsuite | 85 | +++ b/tests/testsuite |
85 | +++ libtool-2.4.2/tests/testsuite | 86 | @@ -48945,7 +48945,7 @@ $at_traceon; } |
86 | @@ -26676,7 +26676,7 @@ $at_traceon; } | ||
87 | 87 | ||
88 | 88 | ||
89 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | 89 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" |
@@ -91,8 +91,8 @@ Index: libtool-2.4.2/tests/testsuite | |||
91 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" | 91 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" |
92 | 92 | ||
93 | #??? | 93 | #??? |
94 | if test "$shlibpath_var" = PATH; then | 94 | if test PATH = "$shlibpath_var"; then |
95 | @@ -26874,7 +26874,7 @@ AM_INIT_AUTOMAKE([foreign]) | 95 | @@ -49154,7 +49154,7 @@ AM_INIT_AUTOMAKE([foreign]) |
96 | AC_PROG_CC | 96 | AC_PROG_CC |
97 | AC_CONFIG_SRCDIR([lib2.c]) | 97 | AC_CONFIG_SRCDIR([lib2.c]) |
98 | LT_INIT | 98 | LT_INIT |
@@ -101,7 +101,7 @@ Index: libtool-2.4.2/tests/testsuite | |||
101 | AC_SUBST([sysroot]) | 101 | AC_SUBST([sysroot]) |
102 | AC_OUTPUT(Makefile) | 102 | AC_OUTPUT(Makefile) |
103 | _ATEOF | 103 | _ATEOF |
104 | @@ -27051,7 +27051,7 @@ AM_INIT_AUTOMAKE([foreign]) | 104 | @@ -49342,7 +49342,7 @@ AM_INIT_AUTOMAKE([foreign]) |
105 | AC_PROG_CC | 105 | AC_PROG_CC |
106 | AC_CONFIG_SRCDIR([prog.c]) | 106 | AC_CONFIG_SRCDIR([prog.c]) |
107 | LT_INIT | 107 | LT_INIT |
@@ -110,7 +110,7 @@ Index: libtool-2.4.2/tests/testsuite | |||
110 | AC_SUBST([sysroot]) | 110 | AC_SUBST([sysroot]) |
111 | AC_OUTPUT(Makefile) | 111 | AC_OUTPUT(Makefile) |
112 | _ATEOF | 112 | _ATEOF |
113 | @@ -27392,7 +27392,7 @@ $at_traceon; } | 113 | @@ -49694,7 +49694,7 @@ $at_traceon; } |
114 | 114 | ||
115 | 115 | ||
116 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | 116 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" |
@@ -118,8 +118,8 @@ Index: libtool-2.4.2/tests/testsuite | |||
118 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" | 118 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" |
119 | 119 | ||
120 | #??? | 120 | #??? |
121 | if test "$shlibpath_var" = PATH; then | 121 | if test PATH = "$shlibpath_var"; then |
122 | @@ -27590,7 +27590,7 @@ AM_INIT_AUTOMAKE([foreign]) | 122 | @@ -49903,7 +49903,7 @@ AM_INIT_AUTOMAKE([foreign]) |
123 | AC_PROG_CC | 123 | AC_PROG_CC |
124 | AC_CONFIG_SRCDIR([lib2.c]) | 124 | AC_CONFIG_SRCDIR([lib2.c]) |
125 | LT_INIT | 125 | LT_INIT |
@@ -128,7 +128,7 @@ Index: libtool-2.4.2/tests/testsuite | |||
128 | AC_SUBST([sysroot]) | 128 | AC_SUBST([sysroot]) |
129 | AC_OUTPUT(Makefile) | 129 | AC_OUTPUT(Makefile) |
130 | _ATEOF | 130 | _ATEOF |
131 | @@ -27767,7 +27767,7 @@ AM_INIT_AUTOMAKE([foreign]) | 131 | @@ -50091,7 +50091,7 @@ AM_INIT_AUTOMAKE([foreign]) |
132 | AC_PROG_CC | 132 | AC_PROG_CC |
133 | AC_CONFIG_SRCDIR([prog.c]) | 133 | AC_CONFIG_SRCDIR([prog.c]) |
134 | LT_INIT | 134 | LT_INIT |
@@ -137,7 +137,7 @@ Index: libtool-2.4.2/tests/testsuite | |||
137 | AC_SUBST([sysroot]) | 137 | AC_SUBST([sysroot]) |
138 | AC_OUTPUT(Makefile) | 138 | AC_OUTPUT(Makefile) |
139 | _ATEOF | 139 | _ATEOF |
140 | @@ -28108,7 +28108,7 @@ $at_traceon; } | 140 | @@ -50443,7 +50443,7 @@ $at_traceon; } |
141 | 141 | ||
142 | 142 | ||
143 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | 143 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" |
@@ -145,8 +145,8 @@ Index: libtool-2.4.2/tests/testsuite | |||
145 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" | 145 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" |
146 | 146 | ||
147 | #??? | 147 | #??? |
148 | if test "$shlibpath_var" = PATH; then | 148 | if test PATH = "$shlibpath_var"; then |
149 | @@ -28306,7 +28306,7 @@ AM_INIT_AUTOMAKE([foreign]) | 149 | @@ -50652,7 +50652,7 @@ AM_INIT_AUTOMAKE([foreign]) |
150 | AC_PROG_CC | 150 | AC_PROG_CC |
151 | AC_CONFIG_SRCDIR([lib2.c]) | 151 | AC_CONFIG_SRCDIR([lib2.c]) |
152 | LT_INIT | 152 | LT_INIT |
@@ -155,7 +155,7 @@ Index: libtool-2.4.2/tests/testsuite | |||
155 | AC_SUBST([sysroot]) | 155 | AC_SUBST([sysroot]) |
156 | AC_OUTPUT(Makefile) | 156 | AC_OUTPUT(Makefile) |
157 | _ATEOF | 157 | _ATEOF |
158 | @@ -28483,7 +28483,7 @@ AM_INIT_AUTOMAKE([foreign]) | 158 | @@ -50840,7 +50840,7 @@ AM_INIT_AUTOMAKE([foreign]) |
159 | AC_PROG_CC | 159 | AC_PROG_CC |
160 | AC_CONFIG_SRCDIR([prog.c]) | 160 | AC_CONFIG_SRCDIR([prog.c]) |
161 | LT_INIT | 161 | LT_INIT |