diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-05-24 09:38:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-06 15:58:39 +0100 |
commit | d0c2307bca5e98c7ff7bbef9867cebce7b8aeafa (patch) | |
tree | 08e62d30eca23d0bde1da736aa5ee4760fa3235b /meta/recipes-devtools/autoconf/autoconf | |
parent | 5d359880f000700a7305d1b4548707652df6388e (diff) | |
download | poky-d0c2307bca5e98c7ff7bbef9867cebce7b8aeafa.tar.gz |
autoconf: upgrade from 2.65 to 2.68
And rebase the patches to the newer code.
(From OE-Core rev: aa24c1eda4b33b329d330c8bbb6d243dfd924f62)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/autoconf/autoconf')
10 files changed, 565 insertions, 0 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch b/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch new file mode 100644 index 0000000000..6ebef0a540 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: lib/autoconf/libs.m4 | ||
4 | =================================================================== | ||
5 | RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v | ||
6 | retrieving revision 1.13 | ||
7 | diff -p -u -r1.13 libs.m4 | ||
8 | --- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 | ||
9 | +++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 | ||
10 | @@ -265,13 +265,13 @@ ac_x_header_dirs=' | ||
11 | /usr/openwin/share/include' | ||
12 | |||
13 | if test "$ac_x_includes" = no; then | ||
14 | - # Guess where to find include files, by looking for Intrinsic.h. | ||
15 | + # Guess where to find include files, by looking for Xlib.h. | ||
16 | # First, try using that file with no special directory specified. | ||
17 | - AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])], | ||
18 | + AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])], | ||
19 | [# We can compile using X headers with no special include directory. | ||
20 | ac_x_includes=], | ||
21 | [for ac_dir in $ac_x_header_dirs; do | ||
22 | - if test -r "$ac_dir/X11/Intrinsic.h"; then | ||
23 | + if test -r "$ac_dir/X11/Xlib.h"; then | ||
24 | ac_x_includes=$ac_dir | ||
25 | break | ||
26 | fi | ||
27 | @@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then | ||
28 | # Don't add to $LIBS permanently. | ||
29 | ac_save_LIBS=$LIBS | ||
30 | - LIBS="-lXt $LIBS" | ||
31 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>], | ||
32 | - [XtMalloc (0)])], | ||
33 | + LIBS="-lX11 $LIBS" | ||
34 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>], | ||
35 | + [XrmInitialize ()])], | ||
36 | [LIBS=$ac_save_LIBS | ||
37 | # We can link X programs with no special library path. | ||
38 | ac_x_libraries=], | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch b/meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch new file mode 100644 index 0000000000..8ae6d5c8aa --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100 | ||
4 | +++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100 | ||
5 | @@ -272,8 +272,8 @@ | ||
6 | } | ||
7 | |||
8 | } | ||
9 | - exit 1 | ||
10 | - if keys %symbol; | ||
11 | +# exit 1 | ||
12 | +# if keys %symbol; | ||
13 | } | ||
14 | |||
15 | update_file ("$tmp/config.hin", "$config_h_in"); | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch new file mode 100644 index 0000000000..d1bd3a2a31 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch | |||
@@ -0,0 +1,139 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: autoconf-2.63/bin/autoreconf.in | ||
4 | =================================================================== | ||
5 | --- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:39:01.000000000 +0000 | ||
6 | +++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:43:38.000000000 +0000 | ||
7 | @@ -76,6 +76,7 @@ | ||
8 | -i, --install copy missing auxiliary files | ||
9 | --no-recursive don't rebuild sub-packages | ||
10 | -s, --symlink with -i, install symbolic links instead of copies | ||
11 | + -x, --exclude=STEPS steps we should not run | ||
12 | -m, --make when applicable, re-run ./configure && make | ||
13 | -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] | ||
14 | |||
15 | @@ -136,6 +137,13 @@ | ||
16 | # Recurse into subpackages | ||
17 | my $recursive = 1; | ||
18 | |||
19 | +# Steps to exclude | ||
20 | +my @exclude; | ||
21 | +my @ex; | ||
22 | + | ||
23 | +my $uses_gettext; | ||
24 | +my $configure_ac; | ||
25 | + | ||
26 | ## ---------- ## | ||
27 | ## Routines. ## | ||
28 | ## ---------- ## | ||
29 | @@ -153,6 +161,7 @@ | ||
30 | 'B|prepend-include=s' => \@prepend_include, | ||
31 | 'i|install' => \$install, | ||
32 | 's|symlink' => \$symlink, | ||
33 | + 'x|exclude=s' => \@exclude, | ||
34 | 'm|make' => \$run_make, | ||
35 | 'recursive!' => \$recursive); | ||
36 | |||
37 | @@ -162,6 +171,8 @@ | ||
38 | parse_WARNINGS; | ||
39 | parse_warnings '--warnings', @warning; | ||
40 | |||
41 | + @exclude = map { split /,/ } @exclude; | ||
42 | + | ||
43 | # Even if the user specified a configure.ac, trim to get the | ||
44 | # directory, and look for configure.ac again. Because (i) the code | ||
45 | # is simpler, and (ii) we are still able to diagnose simultaneous | ||
46 | @@ -255,6 +266,11 @@ | ||
47 | { | ||
48 | my ($aclocal, $flags) = @_; | ||
49 | |||
50 | + @ex = grep (/^aclocal$/, @exclude); | ||
51 | + if ($#ex != -1) { | ||
52 | + return; | ||
53 | + } | ||
54 | + | ||
55 | # aclocal 1.8+ does all this for free. It can be recognized by its | ||
56 | # --force support. | ||
57 | if ($aclocal_supports_force) | ||
58 | @@ -368,7 +384,10 @@ | ||
59 | } | ||
60 | else | ||
61 | { | ||
62 | - xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); | ||
63 | + @ex = grep (/^autopoint$/, @exclude); | ||
64 | + if ($#ex == -1) { | ||
65 | + xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); | ||
66 | + } | ||
67 | } | ||
68 | |||
69 | |||
70 | @@ -532,16 +551,17 @@ | ||
71 | { | ||
72 | $libtoolize .= " --ltdl"; | ||
73 | } | ||
74 | - xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); | ||
75 | - $rerun_aclocal = 1; | ||
76 | + @ex = grep (/^libtoolize$/, @exclude); | ||
77 | + if ($#ex == -1) { | ||
78 | + xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); | ||
79 | + $rerun_aclocal = 1; | ||
80 | + } | ||
81 | } | ||
82 | else | ||
83 | { | ||
84 | verb "$configure_ac: not running libtoolize: --install not given"; | ||
85 | } | ||
86 | |||
87 | - | ||
88 | - | ||
89 | # ------------------- # | ||
90 | # Rerunning aclocal. # | ||
91 | # ------------------- # | ||
92 | @@ -572,7 +592,10 @@ | ||
93 | # latter runs the former, and (ii) autoconf is stricter than | ||
94 | # autoheader. So all in all, autoconf should give better error | ||
95 | # messages. | ||
96 | - xsystem ($autoconf); | ||
97 | + @ex = grep (/^autoconf$/, @exclude); | ||
98 | + if ($#ex == -1) { | ||
99 | + xsystem ("$autoconf"); | ||
100 | + } | ||
101 | |||
102 | |||
103 | # -------------------- # | ||
104 | @@ -593,7 +616,10 @@ | ||
105 | } | ||
106 | else | ||
107 | { | ||
108 | - xsystem ($autoheader); | ||
109 | + @ex = grep (/^autoheader$/, @exclude); | ||
110 | + if ($#ex == -1) { | ||
111 | + xsystem ("$autoheader"); | ||
112 | + } | ||
113 | } | ||
114 | |||
115 | |||
116 | @@ -610,7 +636,10 @@ | ||
117 | # We should always run automake, and let it decide whether it shall | ||
118 | # update the file or not. In fact, the effect of `$force' is already | ||
119 | # included in `$automake' via `--no-force'. | ||
120 | - xsystem ($automake); | ||
121 | + @ex = grep (/^automake$/, @exclude); | ||
122 | + if ($#ex == -1) { | ||
123 | + xsystem ("$automake"); | ||
124 | + } | ||
125 | } | ||
126 | |||
127 | |||
128 | @@ -634,7 +663,10 @@ | ||
129 | } | ||
130 | else | ||
131 | { | ||
132 | - xsystem ("$make"); | ||
133 | + @ex = grep (/^make$/, @exclude); | ||
134 | + if ($#ex == -1) { | ||
135 | + xsystem ("$make"); | ||
136 | + } | ||
137 | } | ||
138 | } | ||
139 | } | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch new file mode 100644 index 0000000000..88f750195d --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 | ||
4 | +++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 | ||
5 | @@ -184,6 +184,8 @@ | ||
6 | |||
7 | $aclocal_supports_force = `$aclocal --help` =~ /--force/; | ||
8 | |||
9 | + $automake .= ' --foreign'; | ||
10 | + | ||
11 | # Dispatch autoreconf's option to the tools. | ||
12 | # --include; | ||
13 | $autoconf .= join (' --include=', '', @include); | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch new file mode 100644 index 0000000000..5ff18c2350 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | # | ||
4 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
5 | # | ||
6 | |||
7 | Index: autoconf-2.63/bin/autoreconf.in | ||
8 | =================================================================== | ||
9 | --- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:43:55.000000000 +0000 | ||
10 | +++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:46:16.000000000 +0000 | ||
11 | @@ -58,7 +58,7 @@ | ||
12 | $help = "Usage: $0 [OPTION]... [DIRECTORY]... | ||
13 | |||
14 | Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' | ||
15 | -(formerly `gettextize'), and `libtoolize' where appropriate) | ||
16 | +(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) | ||
17 | repeatedly to remake the GNU Build System files in specified | ||
18 | DIRECTORIES and their subdirectories (defaulting to `.'). | ||
19 | |||
20 | @@ -115,6 +115,7 @@ | ||
21 | my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; | ||
22 | my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; | ||
23 | my $make = $ENV{'MAKE'} || 'make'; | ||
24 | +my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; | ||
25 | |||
26 | # --install -- as --add-missing in other tools. | ||
27 | my $install = 0; | ||
28 | @@ -644,6 +645,10 @@ | ||
29 | } | ||
30 | } | ||
31 | |||
32 | + @ex = grep (/^gnu-configize$/, @exclude); | ||
33 | + if ($#ex == -1) { | ||
34 | + xsystem ("$gnuconfigize"); | ||
35 | + } | ||
36 | |||
37 | # -------------- # | ||
38 | # Running make. # | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch new file mode 100644 index 0000000000..31326f0bc8 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: autoconf-2.63/bin/autoreconf.in | ||
4 | =================================================================== | ||
5 | --- autoconf-2.63.orig/bin/autoreconf.in 2008-08-28 03:08:10.000000000 +0100 | ||
6 | +++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:38:40.000000000 +0000 | ||
7 | @@ -190,6 +190,7 @@ | ||
8 | $autoconf .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); | ||
9 | $autoheader .= join (' --include=', '', map { shell_quote ($_) } @include); | ||
10 | $autoheader .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); | ||
11 | + $aclocal .= join (' -I ', '', map { shell_quote ($_) } @include); | ||
12 | |||
13 | # --install and --symlink; | ||
14 | if ($install) | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/config_site.patch b/meta/recipes-devtools/autoconf/autoconf/config_site.patch new file mode 100644 index 0000000000..9f044404dd --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/config_site.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Poky provides a list of site files in CONFIG_SITE whereas autoconf | ||
4 | only expects one file. This patch changes autoconf to accept a list of | ||
5 | them. | ||
6 | |||
7 | RP 1/2/10 | ||
8 | |||
9 | Updated for 2.68 version: the CONFIG_SITE var was not getting used at all | ||
10 | fixed the 2.68 code | ||
11 | Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/27 | ||
12 | |||
13 | Index: autoconf-2.68/lib/autoconf/general.m4 | ||
14 | =================================================================== | ||
15 | --- autoconf-2.68.orig/lib/autoconf/general.m4 | ||
16 | +++ autoconf-2.68/lib/autoconf/general.m4 | ||
17 | @@ -1878,7 +1878,6 @@ AU_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPL | ||
18 | m4_define([AC_SITE_LOAD], | ||
19 | [# Prefer an explicitly selected file to automatically selected ones. | ||
20 | ac_site_file1=NONE | ||
21 | -ac_site_file2=NONE | ||
22 | if test -n "$CONFIG_SITE"; then | ||
23 | # We do not want a PATH search for config.site. | ||
24 | case $CONFIG_SITE in @%:@(( | ||
25 | @@ -1886,14 +1885,8 @@ if test -n "$CONFIG_SITE"; then | ||
26 | */*) ac_site_file1=$CONFIG_SITE;; | ||
27 | *) ac_site_file1=./$CONFIG_SITE;; | ||
28 | esac | ||
29 | -elif test "x$prefix" != xNONE; then | ||
30 | - ac_site_file1=$prefix/share/config.site | ||
31 | - ac_site_file2=$prefix/etc/config.site | ||
32 | -else | ||
33 | - ac_site_file1=$ac_default_prefix/share/config.site | ||
34 | - ac_site_file2=$ac_default_prefix/etc/config.site | ||
35 | fi | ||
36 | -for ac_site_file in "$ac_site_file1" "$ac_site_file2" | ||
37 | +for ac_site_file in $ac_site_file1 | ||
38 | do | ||
39 | test "x$ac_site_file" = xNONE && continue | ||
40 | if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch b/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch new file mode 100644 index 0000000000..65df88f8f9 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch | |||
@@ -0,0 +1,120 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | We don't build xmkmf so any values returned from it are going to be wrong. | ||
4 | Using any paths in /usr/ for x headers/libs is a bad idea when cross compiling. | ||
5 | This patch removes them to stop any confusion. | ||
6 | |||
7 | RP - 20071115 | ||
8 | |||
9 | Index: autoconf-2.68/lib/autoconf/libs.m4 | ||
10 | =================================================================== | ||
11 | --- autoconf-2.68.orig/lib/autoconf/libs.m4 | ||
12 | +++ autoconf-2.68/lib/autoconf/libs.m4 | ||
13 | @@ -159,53 +159,6 @@ m4_popdef([AC_Lib_Name])dnl | ||
14 | # --------------------- # | ||
15 | |||
16 | |||
17 | -# _AC_PATH_X_XMKMF | ||
18 | -# ---------------- | ||
19 | -# Internal subroutine of _AC_PATH_X. | ||
20 | -# Set ac_x_includes and/or ac_x_libraries. | ||
21 | -m4_define([_AC_PATH_X_XMKMF], | ||
22 | -[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl | ||
23 | -rm -f -r conftest.dir | ||
24 | -if mkdir conftest.dir; then | ||
25 | - cd conftest.dir | ||
26 | - cat >Imakefile <<'_ACEOF' | ||
27 | -incroot: | ||
28 | - @echo incroot='${INCROOT}' | ||
29 | -usrlibdir: | ||
30 | - @echo usrlibdir='${USRLIBDIR}' | ||
31 | -libdir: | ||
32 | - @echo libdir='${LIBDIR}' | ||
33 | -_ACEOF | ||
34 | - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then | ||
35 | - # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. | ||
36 | - for ac_var in incroot usrlibdir libdir; do | ||
37 | - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" | ||
38 | - done | ||
39 | - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. | ||
40 | - for ac_extension in a so sl dylib la dll; do | ||
41 | - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && | ||
42 | - test -f "$ac_im_libdir/libX11.$ac_extension"; then | ||
43 | - ac_im_usrlibdir=$ac_im_libdir; break | ||
44 | - fi | ||
45 | - done | ||
46 | - # Screen out bogus values from the imake configuration. They are | ||
47 | - # bogus both because they are the default anyway, and because | ||
48 | - # using them would break gcc on systems where it needs fixed includes. | ||
49 | - case $ac_im_incroot in | ||
50 | - /usr/include) ac_x_includes= ;; | ||
51 | - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; | ||
52 | - esac | ||
53 | - case $ac_im_usrlibdir in | ||
54 | - /usr/lib | /usr/lib64 | /lib | /lib64) ;; | ||
55 | - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; | ||
56 | - esac | ||
57 | - fi | ||
58 | - cd .. | ||
59 | - rm -f -r conftest.dir | ||
60 | -fi | ||
61 | -])# _AC_PATH_X_XMKMF | ||
62 | - | ||
63 | - | ||
64 | # _AC_PATH_X_DIRECT | ||
65 | # ----------------- | ||
66 | # Internal subroutine of _AC_PATH_X. | ||
67 | @@ -213,44 +166,7 @@ fi | ||
68 | m4_define([_AC_PATH_X_DIRECT], | ||
69 | [# Standard set of common directories for X headers. | ||
70 | # Check X11 before X11Rn because it is often a symlink to the current release. | ||
71 | -ac_x_header_dirs=' | ||
72 | -/usr/X11/include | ||
73 | -/usr/X11R7/include | ||
74 | -/usr/X11R6/include | ||
75 | -/usr/X11R5/include | ||
76 | -/usr/X11R4/include | ||
77 | - | ||
78 | -/usr/include/X11 | ||
79 | -/usr/include/X11R7 | ||
80 | -/usr/include/X11R6 | ||
81 | -/usr/include/X11R5 | ||
82 | -/usr/include/X11R4 | ||
83 | - | ||
84 | -/usr/local/X11/include | ||
85 | -/usr/local/X11R7/include | ||
86 | -/usr/local/X11R6/include | ||
87 | -/usr/local/X11R5/include | ||
88 | -/usr/local/X11R4/include | ||
89 | - | ||
90 | -/usr/local/include/X11 | ||
91 | -/usr/local/include/X11R7 | ||
92 | -/usr/local/include/X11R6 | ||
93 | -/usr/local/include/X11R5 | ||
94 | -/usr/local/include/X11R4 | ||
95 | - | ||
96 | -/usr/X386/include | ||
97 | -/usr/x386/include | ||
98 | -/usr/XFree86/include/X11 | ||
99 | - | ||
100 | -/usr/include | ||
101 | -/usr/local/include | ||
102 | -/usr/unsupported/include | ||
103 | -/usr/athena/include | ||
104 | -/usr/local/x11r5/include | ||
105 | -/usr/lpp/Xamples/include | ||
106 | - | ||
107 | -/usr/openwin/include | ||
108 | -/usr/openwin/share/include' | ||
109 | +ac_x_header_dirs='' | ||
110 | |||
111 | if test "$ac_x_includes" = no; then | ||
112 | # Guess where to find include files, by looking for Xlib.h. | ||
113 | @@ -299,7 +215,6 @@ AC_DEFUN([_AC_PATH_X], | ||
114 | [AC_CACHE_VAL(ac_cv_have_x, | ||
115 | [# One or both of the vars are not set, and there is no cached value. | ||
116 | ac_x_includes=no ac_x_libraries=no | ||
117 | -_AC_PATH_X_XMKMF | ||
118 | _AC_PATH_X_DIRECT | ||
119 | case $ac_x_includes,$ac_x_libraries in #( | ||
120 | no,* | *,no | *\'*) | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch b/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch new file mode 100644 index 0000000000..cb57dfdfe7 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch | |||
@@ -0,0 +1,128 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Index: autoconf-2.59/bin/autoheader.in | ||
4 | =================================================================== | ||
5 | --- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500 | ||
6 | +++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500 | ||
7 | @@ -1,8 +1,8 @@ | ||
8 | -#! @PERL@ | ||
9 | +#! @bindir@/env perl | ||
10 | # -*- Perl -*- | ||
11 | # @configure_input@ | ||
12 | |||
13 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
14 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' | ||
15 | if 0; | ||
16 | |||
17 | # autoheader -- create `config.h.in' from `configure.ac' | ||
18 | Index: autoconf-2.59/bin/autom4te.in | ||
19 | =================================================================== | ||
20 | --- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500 | ||
21 | +++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500 | ||
22 | @@ -1,8 +1,10 @@ | ||
23 | -#! @PERL@ -w | ||
24 | +#! @bindir@/env perl | ||
25 | # -*- perl -*- | ||
26 | # @configure_input@ | ||
27 | |||
28 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
29 | +use warnings; | ||
30 | + | ||
31 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
32 | if 0; | ||
33 | |||
34 | # autom4te - Wrapper around M4 libraries. | ||
35 | @@ -87,7 +89,7 @@ | ||
36 | my $freeze = 0; | ||
37 | |||
38 | # $M4. | ||
39 | -my $m4 = $ENV{"M4"} || '@M4@'; | ||
40 | +my $m4 = $ENV{"M4"} || '@bindir@/env m4'; | ||
41 | # Some non-GNU m4's don't reject the --help option, so give them /dev/null. | ||
42 | fatal "need GNU m4 1.4 or later: $m4" | ||
43 | if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null"; | ||
44 | Index: autoconf-2.59/bin/autoreconf.in | ||
45 | =================================================================== | ||
46 | --- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500 | ||
47 | +++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500 | ||
48 | @@ -1,8 +1,10 @@ | ||
49 | -#! @PERL@ -w | ||
50 | +#! @bindir@/env perl | ||
51 | # -*- perl -*- | ||
52 | # @configure_input@ | ||
53 | |||
54 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
55 | +use warnings; | ||
56 | + | ||
57 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
58 | if 0; | ||
59 | |||
60 | # autoreconf - install the GNU Build System in a directory tree | ||
61 | Index: autoconf-2.59/bin/autoscan.in | ||
62 | =================================================================== | ||
63 | --- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400 | ||
64 | +++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500 | ||
65 | @@ -1,4 +1,4 @@ | ||
66 | -#! @PERL@ -w | ||
67 | +#! @bindir@/env perl | ||
68 | # -*- perl -*- | ||
69 | # autoscan - Create configure.scan (a preliminary configure.ac) for a package. | ||
70 | # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 | ||
71 | @@ -21,7 +21,9 @@ | ||
72 | |||
73 | # Written by David MacKenzie <djm@gnu.ai.mit.edu>. | ||
74 | |||
75 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
76 | +use warnings; | ||
77 | + | ||
78 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
79 | if 0; | ||
80 | |||
81 | BEGIN | ||
82 | Index: autoconf-2.59/bin/autoupdate.in | ||
83 | =================================================================== | ||
84 | --- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400 | ||
85 | +++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500 | ||
86 | @@ -1,4 +1,4 @@ | ||
87 | -#! @PERL@ -w | ||
88 | +#! @bindir@/env perl | ||
89 | # -*- perl -*- | ||
90 | # autoupdate - modernize an Autoconf file. | ||
91 | # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 | ||
92 | @@ -22,7 +22,9 @@ | ||
93 | # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>. | ||
94 | # Rewritten by Akim Demaille <akim@freefriends.org>. | ||
95 | |||
96 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
97 | +use warnings; | ||
98 | + | ||
99 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
100 | if 0; | ||
101 | |||
102 | BEGIN | ||
103 | @@ -54,7 +56,7 @@ | ||
104 | my @include = ('@datadir@'); | ||
105 | my $force = 0; | ||
106 | # m4. | ||
107 | -my $m4 = $ENV{"M4"} || '@M4@'; | ||
108 | +my $m4 = $ENV{"M4"} || '@bindir@/env m4'; | ||
109 | |||
110 | |||
111 | # $HELP | ||
112 | Index: autoconf-2.59/bin/ifnames.in | ||
113 | =================================================================== | ||
114 | --- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400 | ||
115 | +++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500 | ||
116 | @@ -1,8 +1,10 @@ | ||
117 | -#! @PERL@ -w | ||
118 | +#! @bindir@/env perl | ||
119 | # -*- perl -*- | ||
120 | # @configure_input@ | ||
121 | |||
122 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
123 | +use warnings; | ||
124 | + | ||
125 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
126 | if 0; | ||
127 | |||
128 | # ifnames - print the identifiers used in C preprocessor conditionals | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch b/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch new file mode 100644 index 0000000000..978a401f0a --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | # | ||
4 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
5 | # | ||
6 | |||
7 | --- autoconf-2.57/lib/autoconf/general.m4~program_prefix | ||
8 | +++ autoconf-2.57/lib/autoconf/general.m4 | ||
9 | @@ -1676,8 +1676,9 @@ | ||
10 | # The aliases save the names the user supplied, while $host etc. | ||
11 | # will get canonicalized. | ||
12 | test -n "$target_alias" && | ||
13 | - test "$program_prefix$program_suffix$program_transform_name" = \ | ||
14 | - NONENONEs,x,x, && | ||
15 | + test "$target_alias" != "$host_alias" && | ||
16 | + test "$program_prefix$program_suffix$program_transform_name" = \ | ||
17 | + NONENONEs,x,x, && | ||
18 | program_prefix=${target_alias}-[]dnl | ||
19 | ])# AC_CANONICAL_TARGET | ||
20 | |||