diff options
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch | 30 |
1 files changed, 16 insertions, 14 deletions
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 6da283959e..1920e2e6db 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 | |||
@@ -13,13 +13,14 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html | |||
13 | 13 | ||
14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html] | 14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html] |
15 | 15 | ||
16 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | 16 | Index: libtool-2.4.7/m4/libtool.m4 |
17 | --- a/m4/libtool.m4 | 17 | =================================================================== |
18 | +++ b/m4/libtool.m4 | 18 | --- libtool-2.4.7.orig/m4/libtool.m4 |
19 | @@ -1215,28 +1215,28 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) | 19 | +++ libtool-2.4.7/m4/libtool.m4 |
20 | # ---------------- | 20 | @@ -1244,28 +1244,28 @@ _LT_DECL([], [ECHO], [1], [An echo progr |
21 | AC_DEFUN([_LT_WITH_SYSROOT], | 21 | AC_DEFUN([_LT_WITH_SYSROOT], |
22 | [AC_MSG_CHECKING([for sysroot]) | 22 | [m4_require([_LT_DECL_SED])dnl |
23 | AC_MSG_CHECKING([for sysroot]) | ||
23 | -AC_ARG_WITH([sysroot], | 24 | -AC_ARG_WITH([sysroot], |
24 | -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], | 25 | -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], |
25 | +AC_ARG_WITH([libtool-sysroot], | 26 | +AC_ARG_WITH([libtool-sysroot], |
@@ -40,8 +41,8 @@ diff --git a/m4/libtool.m4 b/m4/libtool.m4 | |||
40 | fi | 41 | fi |
41 | ;; #( | 42 | ;; #( |
42 | /*) | 43 | /*) |
43 | - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | 44 | - lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` |
44 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | 45 | + lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` |
45 | ;; #( | 46 | ;; #( |
46 | no|'') | 47 | no|'') |
47 | ;; #( | 48 | ;; #( |
@@ -51,10 +52,11 @@ diff --git a/m4/libtool.m4 b/m4/libtool.m4 | |||
51 | AC_MSG_ERROR([The sysroot must be an absolute path.]) | 52 | AC_MSG_ERROR([The sysroot must be an absolute path.]) |
52 | ;; | 53 | ;; |
53 | esac | 54 | esac |
54 | diff --git a/tests/sysroot.at b/tests/sysroot.at | 55 | Index: libtool-2.4.7/tests/sysroot.at |
55 | --- a/tests/sysroot.at | 56 | =================================================================== |
56 | +++ b/tests/sysroot.at | 57 | --- libtool-2.4.7.orig/tests/sysroot.at |
57 | @@ -64,7 +64,7 @@ while read file; do | 58 | +++ libtool-2.4.7/tests/sysroot.at |
59 | @@ -65,7 +65,7 @@ while read file; do | ||
58 | done]) | 60 | done]) |
59 | 61 | ||
60 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | 62 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" |
@@ -63,7 +65,7 @@ diff --git a/tests/sysroot.at b/tests/sysroot.at | |||
63 | 65 | ||
64 | #??? | 66 | #??? |
65 | if test PATH = "$shlibpath_var"; then | 67 | if test PATH = "$shlibpath_var"; then |
66 | @@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign]) | 68 | @@ -115,7 +115,7 @@ AM_INIT_AUTOMAKE([foreign]) |
67 | AC_PROG_CC | 69 | AC_PROG_CC |
68 | AC_CONFIG_SRCDIR([lib2.c]) | 70 | AC_CONFIG_SRCDIR([lib2.c]) |
69 | LT_INIT | 71 | LT_INIT |
@@ -72,7 +74,7 @@ diff --git a/tests/sysroot.at b/tests/sysroot.at | |||
72 | AC_SUBST([sysroot]) | 74 | AC_SUBST([sysroot]) |
73 | AC_OUTPUT(Makefile) | 75 | AC_OUTPUT(Makefile) |
74 | ]]) | 76 | ]]) |
75 | @@ -155,7 +155,7 @@ AM_INIT_AUTOMAKE([foreign]) | 77 | @@ -156,7 +156,7 @@ AM_INIT_AUTOMAKE([foreign]) |
76 | AC_PROG_CC | 78 | AC_PROG_CC |
77 | AC_CONFIG_SRCDIR([prog.c]) | 79 | AC_CONFIG_SRCDIR([prog.c]) |
78 | LT_INIT | 80 | LT_INIT |