summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch')
-rw-r--r--meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch166
1 files changed, 166 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
new file mode 100644
index 0000000..c3e3e86
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
@@ -0,0 +1,166 @@
1Upstream-Status: Pending
2
3This patch renames the --with-sysroot option to --with-libtool-sysroot
4to avoid namespace conflict with binutils, gcc and other toolchain
5components.
6
7I also reported the problem to libtool here
8
9http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
10
11-Khem Raj <raj.khem@gmail.com>
12
13Index: libtool-2.4.2/libltdl/m4/libtool.m4
14===================================================================
15--- libtool-2.4.2.orig/libltdl/m4/libtool.m4
16+++ libtool-2.4.2/libltdl/m4/libtool.m4
17@@ -1224,27 +1224,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr
18 # ----------------
19 AC_DEFUN([_LT_WITH_SYSROOT],
20 [AC_MSG_CHECKING([for sysroot])
21-AC_ARG_WITH([sysroot],
22-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
23+AC_ARG_WITH([libtool-sysroot],
24+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
25 (or the compiler's sysroot if not specified).],
26-[], [with_sysroot=no])
27+[], [with_libtool_sysroot=no])
28
29 dnl lt_sysroot will always be passed unquoted. We quote it here
30 dnl in case the user passed a directory name.
31 lt_sysroot=
32-case ${with_sysroot} in #(
33+case ${with_libtool_sysroot} in #(
34 yes)
35 if test "$GCC" = yes; then
36 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
37 fi
38 ;; #(
39 /*)
40- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
41+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
42 ;; #(
43 no|'')
44 ;; #(
45 *)
46- AC_MSG_RESULT([${with_sysroot}])
47+ AC_MSG_RESULT([${with_libtool_sysroot}])
48 AC_MSG_ERROR([The sysroot must be an absolute path.])
49 ;;
50 esac
51Index: libtool-2.4.2/tests/sysroot.at
52===================================================================
53--- libtool-2.4.2.orig/tests/sysroot.at
54+++ libtool-2.4.2/tests/sysroot.at
55@@ -64,7 +64,7 @@ while read file; do
56 done])
57
58 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
59-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
60+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
61
62 #???
63 if test "$shlibpath_var" = PATH; then
64@@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign])
65 AC_PROG_CC
66 AC_CONFIG_SRCDIR([lib2.c])
67 LT_INIT
68-sysroot=$with_sysroot
69+sysroot=$with_libtool_sysroot
70 AC_SUBST([sysroot])
71 AC_OUTPUT(Makefile)
72 ]])
73@@ -155,7 +155,7 @@ AM_INIT_AUTOMAKE([foreign])
74 AC_PROG_CC
75 AC_CONFIG_SRCDIR([prog.c])
76 LT_INIT
77-sysroot=$with_sysroot
78+sysroot=$with_libtool_sysroot
79 AC_SUBST([sysroot])
80 AC_OUTPUT(Makefile)
81 ]])
82Index: libtool-2.4.2/tests/testsuite
83===================================================================
84--- libtool-2.4.2.orig/tests/testsuite
85+++ libtool-2.4.2/tests/testsuite
86@@ -26676,7 +26676,7 @@ $at_traceon; }
87
88
89 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
90-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
91+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
92
93 #???
94 if test "$shlibpath_var" = PATH; then
95@@ -26874,7 +26874,7 @@ AM_INIT_AUTOMAKE([foreign])
96 AC_PROG_CC
97 AC_CONFIG_SRCDIR([lib2.c])
98 LT_INIT
99-sysroot=$with_sysroot
100+sysroot=$with_libtool_sysroot
101 AC_SUBST([sysroot])
102 AC_OUTPUT(Makefile)
103 _ATEOF
104@@ -27051,7 +27051,7 @@ AM_INIT_AUTOMAKE([foreign])
105 AC_PROG_CC
106 AC_CONFIG_SRCDIR([prog.c])
107 LT_INIT
108-sysroot=$with_sysroot
109+sysroot=$with_libtool_sysroot
110 AC_SUBST([sysroot])
111 AC_OUTPUT(Makefile)
112 _ATEOF
113@@ -27392,7 +27392,7 @@ $at_traceon; }
114
115
116 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
117-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
118+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
119
120 #???
121 if test "$shlibpath_var" = PATH; then
122@@ -27590,7 +27590,7 @@ AM_INIT_AUTOMAKE([foreign])
123 AC_PROG_CC
124 AC_CONFIG_SRCDIR([lib2.c])
125 LT_INIT
126-sysroot=$with_sysroot
127+sysroot=$with_libtool_sysroot
128 AC_SUBST([sysroot])
129 AC_OUTPUT(Makefile)
130 _ATEOF
131@@ -27767,7 +27767,7 @@ AM_INIT_AUTOMAKE([foreign])
132 AC_PROG_CC
133 AC_CONFIG_SRCDIR([prog.c])
134 LT_INIT
135-sysroot=$with_sysroot
136+sysroot=$with_libtool_sysroot
137 AC_SUBST([sysroot])
138 AC_OUTPUT(Makefile)
139 _ATEOF
140@@ -28108,7 +28108,7 @@ $at_traceon; }
141
142
143 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
144-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
145+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
146
147 #???
148 if test "$shlibpath_var" = PATH; then
149@@ -28306,7 +28306,7 @@ AM_INIT_AUTOMAKE([foreign])
150 AC_PROG_CC
151 AC_CONFIG_SRCDIR([lib2.c])
152 LT_INIT
153-sysroot=$with_sysroot
154+sysroot=$with_libtool_sysroot
155 AC_SUBST([sysroot])
156 AC_OUTPUT(Makefile)
157 _ATEOF
158@@ -28483,7 +28483,7 @@ AM_INIT_AUTOMAKE([foreign])
159 AC_PROG_CC
160 AC_CONFIG_SRCDIR([prog.c])
161 LT_INIT
162-sysroot=$with_sysroot
163+sysroot=$with_libtool_sysroot
164 AC_SUBST([sysroot])
165 AC_OUTPUT(Makefile)
166 _ATEOF