diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-17 12:55:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-19 00:16:41 +0000 |
commit | 8ab08022f6d1e6edbdcdbfdaec858afaded9179b (patch) | |
tree | 6fa791898340cd045532ec462dbacb9610cbd905 /meta | |
parent | 907150679d0e4c44182b4cc8e8f18b090e58fef6 (diff) | |
download | poky-8ab08022f6d1e6edbdcdbfdaec858afaded9179b.tar.gz |
libtool: Update patch offsets
Our patches were rather out of sync, update the line offsets to match the current
patchset/underlying code.
(From OE-Core rev: f3a98cbd1c17ec25593ac11149d81ab80156a101)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
10 files changed, 30 insertions, 28 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch index 4c4d0547a3..51c0c52da8 100644 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch +++ b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch | |||
@@ -15,10 +15,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
15 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html] | 15 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html] |
16 | 16 | ||
17 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 17 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
18 | index 96b37003..3d5dcd0a 100644 | 18 | index a5f21a1..f884824 100644 |
19 | --- a/build-aux/ltmain.in | 19 | --- a/build-aux/ltmain.in |
20 | +++ b/build-aux/ltmain.in | 20 | +++ b/build-aux/ltmain.in |
21 | @@ -2378,8 +2378,14 @@ func_mode_install () | 21 | @@ -2381,8 +2381,14 @@ func_mode_install () |
22 | func_append dir "$objdir" | 22 | func_append dir "$objdir" |
23 | 23 | ||
24 | if test -n "$relink_command"; then | 24 | if test -n "$relink_command"; then |
diff --git a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch index 1920e2e6db..2126f82953 100644 --- a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch +++ b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch | |||
@@ -84,9 +84,10 @@ Index: libtool-2.4.7/tests/sysroot.at | |||
84 | AC_OUTPUT(Makefile) | 84 | AC_OUTPUT(Makefile) |
85 | ]]) | 85 | ]]) |
86 | diff --git a/tests/testsuite b/tests/testsuite | 86 | diff --git a/tests/testsuite b/tests/testsuite |
87 | index 24265e4..d388e3e 100755 | ||
87 | --- a/tests/testsuite | 88 | --- a/tests/testsuite |
88 | +++ b/tests/testsuite | 89 | +++ b/tests/testsuite |
89 | @@ -48945,7 +48945,7 @@ $at_traceon; } | 90 | @@ -48997,7 +48997,7 @@ $at_traceon; } |
90 | 91 | ||
91 | 92 | ||
92 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | 93 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" |
@@ -95,7 +96,7 @@ diff --git a/tests/testsuite b/tests/testsuite | |||
95 | 96 | ||
96 | #??? | 97 | #??? |
97 | if test PATH = "$shlibpath_var"; then | 98 | if test PATH = "$shlibpath_var"; then |
98 | @@ -49154,7 +49154,7 @@ AM_INIT_AUTOMAKE([foreign]) | 99 | @@ -49211,7 +49211,7 @@ AM_INIT_AUTOMAKE([foreign]) |
99 | AC_PROG_CC | 100 | AC_PROG_CC |
100 | AC_CONFIG_SRCDIR([lib2.c]) | 101 | AC_CONFIG_SRCDIR([lib2.c]) |
101 | LT_INIT | 102 | LT_INIT |
@@ -104,7 +105,7 @@ diff --git a/tests/testsuite b/tests/testsuite | |||
104 | AC_SUBST([sysroot]) | 105 | AC_SUBST([sysroot]) |
105 | AC_OUTPUT(Makefile) | 106 | AC_OUTPUT(Makefile) |
106 | _ATEOF | 107 | _ATEOF |
107 | @@ -49342,7 +49342,7 @@ AM_INIT_AUTOMAKE([foreign]) | 108 | @@ -49404,7 +49404,7 @@ AM_INIT_AUTOMAKE([foreign]) |
108 | AC_PROG_CC | 109 | AC_PROG_CC |
109 | AC_CONFIG_SRCDIR([prog.c]) | 110 | AC_CONFIG_SRCDIR([prog.c]) |
110 | LT_INIT | 111 | LT_INIT |
@@ -113,7 +114,7 @@ diff --git a/tests/testsuite b/tests/testsuite | |||
113 | AC_SUBST([sysroot]) | 114 | AC_SUBST([sysroot]) |
114 | AC_OUTPUT(Makefile) | 115 | AC_OUTPUT(Makefile) |
115 | _ATEOF | 116 | _ATEOF |
116 | @@ -49694,7 +49694,7 @@ $at_traceon; } | 117 | @@ -49761,7 +49761,7 @@ $at_traceon; } |
117 | 118 | ||
118 | 119 | ||
119 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | 120 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" |
@@ -122,7 +123,7 @@ diff --git a/tests/testsuite b/tests/testsuite | |||
122 | 123 | ||
123 | #??? | 124 | #??? |
124 | if test PATH = "$shlibpath_var"; then | 125 | if test PATH = "$shlibpath_var"; then |
125 | @@ -49903,7 +49903,7 @@ AM_INIT_AUTOMAKE([foreign]) | 126 | @@ -49975,7 +49975,7 @@ AM_INIT_AUTOMAKE([foreign]) |
126 | AC_PROG_CC | 127 | AC_PROG_CC |
127 | AC_CONFIG_SRCDIR([lib2.c]) | 128 | AC_CONFIG_SRCDIR([lib2.c]) |
128 | LT_INIT | 129 | LT_INIT |
@@ -131,7 +132,7 @@ diff --git a/tests/testsuite b/tests/testsuite | |||
131 | AC_SUBST([sysroot]) | 132 | AC_SUBST([sysroot]) |
132 | AC_OUTPUT(Makefile) | 133 | AC_OUTPUT(Makefile) |
133 | _ATEOF | 134 | _ATEOF |
134 | @@ -50091,7 +50091,7 @@ AM_INIT_AUTOMAKE([foreign]) | 135 | @@ -50168,7 +50168,7 @@ AM_INIT_AUTOMAKE([foreign]) |
135 | AC_PROG_CC | 136 | AC_PROG_CC |
136 | AC_CONFIG_SRCDIR([prog.c]) | 137 | AC_CONFIG_SRCDIR([prog.c]) |
137 | LT_INIT | 138 | LT_INIT |
@@ -140,7 +141,7 @@ diff --git a/tests/testsuite b/tests/testsuite | |||
140 | AC_SUBST([sysroot]) | 141 | AC_SUBST([sysroot]) |
141 | AC_OUTPUT(Makefile) | 142 | AC_OUTPUT(Makefile) |
142 | _ATEOF | 143 | _ATEOF |
143 | @@ -50443,7 +50443,7 @@ $at_traceon; } | 144 | @@ -50525,7 +50525,7 @@ $at_traceon; } |
144 | 145 | ||
145 | 146 | ||
146 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | 147 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" |
@@ -149,7 +150,7 @@ diff --git a/tests/testsuite b/tests/testsuite | |||
149 | 150 | ||
150 | #??? | 151 | #??? |
151 | if test PATH = "$shlibpath_var"; then | 152 | if test PATH = "$shlibpath_var"; then |
152 | @@ -50652,7 +50652,7 @@ AM_INIT_AUTOMAKE([foreign]) | 153 | @@ -50739,7 +50739,7 @@ AM_INIT_AUTOMAKE([foreign]) |
153 | AC_PROG_CC | 154 | AC_PROG_CC |
154 | AC_CONFIG_SRCDIR([lib2.c]) | 155 | AC_CONFIG_SRCDIR([lib2.c]) |
155 | LT_INIT | 156 | LT_INIT |
@@ -158,7 +159,7 @@ diff --git a/tests/testsuite b/tests/testsuite | |||
158 | AC_SUBST([sysroot]) | 159 | AC_SUBST([sysroot]) |
159 | AC_OUTPUT(Makefile) | 160 | AC_OUTPUT(Makefile) |
160 | _ATEOF | 161 | _ATEOF |
161 | @@ -50840,7 +50840,7 @@ AM_INIT_AUTOMAKE([foreign]) | 162 | @@ -50932,7 +50932,7 @@ AM_INIT_AUTOMAKE([foreign]) |
162 | AC_PROG_CC | 163 | AC_PROG_CC |
163 | AC_CONFIG_SRCDIR([prog.c]) | 164 | AC_CONFIG_SRCDIR([prog.c]) |
164 | LT_INIT | 165 | LT_INIT |
diff --git a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch index 07c7f911e0..35f48ef906 100644 --- a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch +++ b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch | |||
@@ -11,10 +11,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
11 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] | 11 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] |
12 | 12 | ||
13 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 13 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
14 | index 3d5dcd0a..2c994612 100644 | 14 | index f884824..25a91de 100644 |
15 | --- a/build-aux/ltmain.in | 15 | --- a/build-aux/ltmain.in |
16 | +++ b/build-aux/ltmain.in | 16 | +++ b/build-aux/ltmain.in |
17 | @@ -6475,7 +6475,7 @@ func_mode_link () | 17 | @@ -6503,7 +6503,7 @@ func_mode_link () |
18 | fi | 18 | fi |
19 | else | 19 | else |
20 | # We cannot seem to hardcode it, guess we'll fake it. | 20 | # We cannot seem to hardcode it, guess we'll fake it. |
diff --git a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch index 4fcf456b0b..9203302182 100644 --- a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch +++ b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch | |||
@@ -10,10 +10,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
10 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] | 10 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] |
11 | 11 | ||
12 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 12 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
13 | index 2c994612..96238350 100644 | 13 | index 25a91de..40cb94a 100644 |
14 | --- a/build-aux/ltmain.in | 14 | --- a/build-aux/ltmain.in |
15 | +++ b/build-aux/ltmain.in | 15 | +++ b/build-aux/ltmain.in |
16 | @@ -7654,9 +7654,11 @@ EOF | 16 | @@ -7682,9 +7682,11 @@ EOF |
17 | test relink = "$opt_mode" || rpath=$compile_rpath$rpath | 17 | test relink = "$opt_mode" || rpath=$compile_rpath$rpath |
18 | for libdir in $rpath; do | 18 | for libdir in $rpath; do |
19 | if test -n "$hardcode_libdir_flag_spec"; then | 19 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -27,7 +27,7 @@ index 2c994612..96238350 100644 | |||
27 | if test -z "$hardcode_libdirs"; then | 27 | if test -z "$hardcode_libdirs"; then |
28 | hardcode_libdirs=$libdir | 28 | hardcode_libdirs=$libdir |
29 | else | 29 | else |
30 | @@ -8386,6 +8388,10 @@ EOF | 30 | @@ -8414,6 +8416,10 @@ EOF |
31 | hardcode_libdirs= | 31 | hardcode_libdirs= |
32 | for libdir in $compile_rpath $finalize_rpath; do | 32 | for libdir in $compile_rpath $finalize_rpath; do |
33 | if test -n "$hardcode_libdir_flag_spec"; then | 33 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -38,7 +38,7 @@ index 2c994612..96238350 100644 | |||
38 | if test -n "$hardcode_libdir_separator"; then | 38 | if test -n "$hardcode_libdir_separator"; then |
39 | if test -z "$hardcode_libdirs"; then | 39 | if test -z "$hardcode_libdirs"; then |
40 | hardcode_libdirs=$libdir | 40 | hardcode_libdirs=$libdir |
41 | @@ -8437,6 +8443,10 @@ EOF | 41 | @@ -8465,6 +8471,10 @@ EOF |
42 | hardcode_libdirs= | 42 | hardcode_libdirs= |
43 | for libdir in $finalize_rpath; do | 43 | for libdir in $finalize_rpath; do |
44 | if test -n "$hardcode_libdir_flag_spec"; then | 44 | if test -n "$hardcode_libdir_flag_spec"; then |
diff --git a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch index 589a33e8a6..8b6352b01b 100644 --- a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch +++ b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch | |||
@@ -13,10 +13,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] | 13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] |
14 | 14 | ||
15 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 15 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
16 | index 96238350..6fb58ed2 100644 | 16 | index 40cb94a..2fa055e 100644 |
17 | --- a/build-aux/ltmain.in | 17 | --- a/build-aux/ltmain.in |
18 | +++ b/build-aux/ltmain.in | 18 | +++ b/build-aux/ltmain.in |
19 | @@ -7672,8 +7672,16 @@ EOF | 19 | @@ -7700,8 +7700,16 @@ EOF |
20 | esac | 20 | esac |
21 | fi | 21 | fi |
22 | else | 22 | else |
@@ -35,7 +35,7 @@ index 96238350..6fb58ed2 100644 | |||
35 | fi | 35 | fi |
36 | elif test -n "$runpath_var"; then | 36 | elif test -n "$runpath_var"; then |
37 | case "$perm_rpath " in | 37 | case "$perm_rpath " in |
38 | @@ -8406,8 +8414,16 @@ EOF | 38 | @@ -8434,8 +8442,16 @@ EOF |
39 | esac | 39 | esac |
40 | fi | 40 | fi |
41 | else | 41 | else |
@@ -54,7 +54,7 @@ index 96238350..6fb58ed2 100644 | |||
54 | fi | 54 | fi |
55 | elif test -n "$runpath_var"; then | 55 | elif test -n "$runpath_var"; then |
56 | case "$perm_rpath " in | 56 | case "$perm_rpath " in |
57 | @@ -8461,8 +8477,14 @@ EOF | 57 | @@ -8489,8 +8505,14 @@ EOF |
58 | esac | 58 | esac |
59 | fi | 59 | fi |
60 | else | 60 | else |
diff --git a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch index 83c74373ae..c151c3b481 100644 --- a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch +++ b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch | |||
@@ -16,10 +16,10 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866 | |||
16 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] | 16 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] |
17 | 17 | ||
18 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | 18 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
19 | index 180dd9d1..022c1292 100644 | 19 | index bd90775..3794130 100644 |
20 | --- a/m4/libtool.m4 | 20 | --- a/m4/libtool.m4 |
21 | +++ b/m4/libtool.m4 | 21 | +++ b/m4/libtool.m4 |
22 | @@ -7560,7 +7560,7 @@ if AC_TRY_EVAL(ac_compile); then | 22 | @@ -7556,7 +7556,7 @@ if AC_TRY_EVAL(ac_compile); then |
23 | for p in `eval "$output_verbose_link_cmd"`; do | 23 | for p in `eval "$output_verbose_link_cmd"`; do |
24 | case $prev$p in | 24 | case $prev$p in |
25 | 25 | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch b/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch index 1543ad2afd..f51deecbef 100644 --- a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch +++ b/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch | |||
@@ -14,7 +14,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
14 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e7dc729dd27b367905cd0ce52b5466d91537857a] | 14 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e7dc729dd27b367905cd0ce52b5466d91537857a] |
15 | 15 | ||
16 | diff --git a/Makefile.am b/Makefile.am | 16 | diff --git a/Makefile.am b/Makefile.am |
17 | index 6b546092..84795d87 100644 | 17 | index c29860e..9c34bfd 100644 |
18 | --- a/Makefile.am | 18 | --- a/Makefile.am |
19 | +++ b/Makefile.am | 19 | +++ b/Makefile.am |
20 | @@ -370,7 +370,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps) | 20 | @@ -370,7 +370,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps) |
diff --git a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch b/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch index 67bd27ac92..e451de59e3 100644 --- a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch +++ b/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch | |||
@@ -16,7 +16,7 @@ Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/ | |||
16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
17 | 17 | ||
18 | diff --git a/Makefile.am b/Makefile.am | 18 | diff --git a/Makefile.am b/Makefile.am |
19 | index 84795d87..8c9949ed 100644 | 19 | index 9c34bfd..231ef3f 100644 |
20 | --- a/Makefile.am | 20 | --- a/Makefile.am |
21 | +++ b/Makefile.am | 21 | +++ b/Makefile.am |
22 | @@ -333,7 +333,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \ | 22 | @@ -333,7 +333,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \ |
diff --git a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch b/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch index b0f771c9bb..8469b8727e 100644 --- a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch +++ b/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch | |||
@@ -13,10 +13,10 @@ https://sources.debian.org/data/main/libt/libtool/2.4.6-10/debian/patches/ | |||
13 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd826173c4c9c3fa8d77d92785754897cb4bfd89] | 13 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd826173c4c9c3fa8d77d92785754897cb4bfd89] |
14 | 14 | ||
15 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | 15 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
16 | index 022c1292..1a8a2998 100644 | 16 | index 3794130..84a550c 100644 |
17 | --- a/m4/libtool.m4 | 17 | --- a/m4/libtool.m4 |
18 | +++ b/m4/libtool.m4 | 18 | +++ b/m4/libtool.m4 |
19 | @@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([ | 19 | @@ -730,7 +730,6 @@ _LT_CONFIG_SAVE_COMMANDS([ |
20 | cat <<_LT_EOF >> "$cfgfile" | 20 | cat <<_LT_EOF >> "$cfgfile" |
21 | #! $SHELL | 21 | #! $SHELL |
22 | # Generated automatically by $as_me ($PACKAGE) $VERSION | 22 | # Generated automatically by $as_me ($PACKAGE) $VERSION |
diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch index fd4084c859..0013d16544 100644 --- a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch +++ b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch | |||
@@ -4,9 +4,10 @@ Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | |||
4 | Updated by: Robert Yang <liezhi.yang@windriver.com> | 4 | Updated by: Robert Yang <liezhi.yang@windriver.com> |
5 | 5 | ||
6 | diff --git a/Makefile.am b/Makefile.am | 6 | diff --git a/Makefile.am b/Makefile.am |
7 | index 7bd7f72..c29860e 100644 | ||
7 | --- a/Makefile.am | 8 | --- a/Makefile.am |
8 | +++ b/Makefile.am | 9 | +++ b/Makefile.am |
9 | @@ -404,21 +404,6 @@ $(notes_txt): $(notes_texi) | 10 | @@ -411,21 +411,6 @@ $(notes_txt): $(notes_texi) |
10 | $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \ | 11 | $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \ |
11 | $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)' | 12 | $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)' |
12 | 13 | ||