diff options
Diffstat (limited to 'meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch')
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch | 118 |
1 files changed, 118 insertions, 0 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch new file mode 100644 index 0000000000..bc735718c1 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch | |||
@@ -0,0 +1,118 @@ | |||
1 | We don't build xmkmf so any values returned from it are going to be wrong. | ||
2 | Using any paths in /usr/ for x headers/libs is a bad idea when cross compiling. | ||
3 | This patch removes them to stop any confusion. | ||
4 | |||
5 | RP - 20071115 | ||
6 | |||
7 | Index: autoconf-2.65/lib/autoconf/libs.m4 | ||
8 | =================================================================== | ||
9 | --- autoconf-2.65.orig/lib/autoconf/libs.m4 2009-10-29 01:53:41.000000000 +0000 | ||
10 | +++ autoconf-2.65/lib/autoconf/libs.m4 2010-01-29 13:40:13.000000000 +0000 | ||
11 | @@ -159,53 +159,6 @@ | ||
12 | # --------------------- # | ||
13 | |||
14 | |||
15 | -# _AC_PATH_X_XMKMF | ||
16 | -# ---------------- | ||
17 | -# Internal subroutine of _AC_PATH_X. | ||
18 | -# Set ac_x_includes and/or ac_x_libraries. | ||
19 | -m4_define([_AC_PATH_X_XMKMF], | ||
20 | -[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl | ||
21 | -rm -f -r conftest.dir | ||
22 | -if mkdir conftest.dir; then | ||
23 | - cd conftest.dir | ||
24 | - cat >Imakefile <<'_ACEOF' | ||
25 | -incroot: | ||
26 | - @echo incroot='${INCROOT}' | ||
27 | -usrlibdir: | ||
28 | - @echo usrlibdir='${USRLIBDIR}' | ||
29 | -libdir: | ||
30 | - @echo libdir='${LIBDIR}' | ||
31 | -_ACEOF | ||
32 | - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then | ||
33 | - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. | ||
34 | - for ac_var in incroot usrlibdir libdir; do | ||
35 | - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" | ||
36 | - done | ||
37 | - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. | ||
38 | - for ac_extension in a so sl dylib la dll; do | ||
39 | - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && | ||
40 | - test -f "$ac_im_libdir/libX11.$ac_extension"; then | ||
41 | - ac_im_usrlibdir=$ac_im_libdir; break | ||
42 | - fi | ||
43 | - done | ||
44 | - # Screen out bogus values from the imake configuration. They are | ||
45 | - # bogus both because they are the default anyway, and because | ||
46 | - # using them would break gcc on systems where it needs fixed includes. | ||
47 | - case $ac_im_incroot in | ||
48 | - /usr/include) ac_x_includes= ;; | ||
49 | - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; | ||
50 | - esac | ||
51 | - case $ac_im_usrlibdir in | ||
52 | - /usr/lib | /usr/lib64 | /lib | /lib64) ;; | ||
53 | - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; | ||
54 | - esac | ||
55 | - fi | ||
56 | - cd .. | ||
57 | - rm -f -r conftest.dir | ||
58 | -fi | ||
59 | -])# _AC_PATH_X_XMKMF | ||
60 | - | ||
61 | - | ||
62 | # _AC_PATH_X_DIRECT | ||
63 | # ----------------- | ||
64 | # Internal subroutine of _AC_PATH_X. | ||
65 | @@ -213,44 +166,7 @@ | ||
66 | m4_define([_AC_PATH_X_DIRECT], | ||
67 | [# Standard set of common directories for X headers. | ||
68 | # Check X11 before X11Rn because it is often a symlink to the current release. | ||
69 | -ac_x_header_dirs=' | ||
70 | -/usr/X11/include | ||
71 | -/usr/X11R7/include | ||
72 | -/usr/X11R6/include | ||
73 | -/usr/X11R5/include | ||
74 | -/usr/X11R4/include | ||
75 | - | ||
76 | -/usr/include/X11 | ||
77 | -/usr/include/X11R7 | ||
78 | -/usr/include/X11R6 | ||
79 | -/usr/include/X11R5 | ||
80 | -/usr/include/X11R4 | ||
81 | - | ||
82 | -/usr/local/X11/include | ||
83 | -/usr/local/X11R7/include | ||
84 | -/usr/local/X11R6/include | ||
85 | -/usr/local/X11R5/include | ||
86 | -/usr/local/X11R4/include | ||
87 | - | ||
88 | -/usr/local/include/X11 | ||
89 | -/usr/local/include/X11R7 | ||
90 | -/usr/local/include/X11R6 | ||
91 | -/usr/local/include/X11R5 | ||
92 | -/usr/local/include/X11R4 | ||
93 | - | ||
94 | -/usr/X386/include | ||
95 | -/usr/x386/include | ||
96 | -/usr/XFree86/include/X11 | ||
97 | - | ||
98 | -/usr/include | ||
99 | -/usr/local/include | ||
100 | -/usr/unsupported/include | ||
101 | -/usr/athena/include | ||
102 | -/usr/local/x11r5/include | ||
103 | -/usr/lpp/Xamples/include | ||
104 | - | ||
105 | -/usr/openwin/include | ||
106 | -/usr/openwin/share/include' | ||
107 | +ac_x_header_dirs='' | ||
108 | |||
109 | if test "$ac_x_includes" = no; then | ||
110 | # Guess where to find include files, by looking for Xlib.h. | ||
111 | @@ -299,7 +215,6 @@ | ||
112 | [AC_CACHE_VAL(ac_cv_have_x, | ||
113 | [# One or both of the vars are not set, and there is no cached value. | ||
114 | ac_x_includes=no ac_x_libraries=no | ||
115 | -_AC_PATH_X_XMKMF | ||
116 | _AC_PATH_X_DIRECT | ||
117 | case $ac_x_includes,$ac_x_libraries in #( | ||
118 | no,* | *,no | *\'*) | ||