diff options
Diffstat (limited to 'meta/recipes-devtools/autoconf')
12 files changed, 573 insertions, 0 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch new file mode 100644 index 0000000000..596535b7d6 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | Index: lib/autoconf/libs.m4 | ||
| 2 | =================================================================== | ||
| 3 | RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v | ||
| 4 | retrieving revision 1.13 | ||
| 5 | diff -p -u -r1.13 libs.m4 | ||
| 6 | --- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 | ||
| 7 | +++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 | ||
| 8 | @@ -265,13 +265,13 @@ ac_x_header_dirs=' | ||
| 9 | /usr/openwin/share/include' | ||
| 10 | |||
| 11 | if test "$ac_x_includes" = no; then | ||
| 12 | - # Guess where to find include files, by looking for Intrinsic.h. | ||
| 13 | + # Guess where to find include files, by looking for Xlib.h. | ||
| 14 | # First, try using that file with no special directory specified. | ||
| 15 | - AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])], | ||
| 16 | + AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])], | ||
| 17 | [# We can compile using X headers with no special include directory. | ||
| 18 | ac_x_includes=], | ||
| 19 | [for ac_dir in $ac_x_header_dirs; do | ||
| 20 | - if test -r "$ac_dir/X11/Intrinsic.h"; then | ||
| 21 | + if test -r "$ac_dir/X11/Xlib.h"; then | ||
| 22 | ac_x_includes=$ac_dir | ||
| 23 | break | ||
| 24 | fi | ||
| 25 | @@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then | ||
| 26 | # Don't add to $LIBS permanently. | ||
| 27 | ac_save_LIBS=$LIBS | ||
| 28 | - LIBS="-lXt $LIBS" | ||
| 29 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>], | ||
| 30 | - [XtMalloc (0)])], | ||
| 31 | + LIBS="-lX11 $LIBS" | ||
| 32 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>], | ||
| 33 | + [XrmInitialize ()])], | ||
| 34 | [LIBS=$ac_save_LIBS | ||
| 35 | # We can link X programs with no special library path. | ||
| 36 | ac_x_libraries=], | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch new file mode 100644 index 0000000000..1f18e04bba --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | --- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100 | ||
| 2 | +++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100 | ||
| 3 | @@ -272,8 +272,8 @@ | ||
| 4 | } | ||
| 5 | |||
| 6 | } | ||
| 7 | - exit 1 | ||
| 8 | - if keys %symbol; | ||
| 9 | +# exit 1 | ||
| 10 | +# if keys %symbol; | ||
| 11 | } | ||
| 12 | |||
| 13 | update_file ("$tmp/config.hin", "$config_h_in"); | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch new file mode 100644 index 0000000000..fac7483bd1 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch | |||
| @@ -0,0 +1,137 @@ | |||
| 1 | Index: autoconf-2.63/bin/autoreconf.in | ||
| 2 | =================================================================== | ||
| 3 | --- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:39:01.000000000 +0000 | ||
| 4 | +++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:43:38.000000000 +0000 | ||
| 5 | @@ -76,6 +76,7 @@ | ||
| 6 | -i, --install copy missing auxiliary files | ||
| 7 | --no-recursive don't rebuild sub-packages | ||
| 8 | -s, --symlink with -i, install symbolic links instead of copies | ||
| 9 | + -x, --exclude=STEPS steps we should not run | ||
| 10 | -m, --make when applicable, re-run ./configure && make | ||
| 11 | -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] | ||
| 12 | |||
| 13 | @@ -136,6 +137,13 @@ | ||
| 14 | # Recurse into subpackages | ||
| 15 | my $recursive = 1; | ||
| 16 | |||
| 17 | +# Steps to exclude | ||
| 18 | +my @exclude; | ||
| 19 | +my @ex; | ||
| 20 | + | ||
| 21 | +my $uses_gettext; | ||
| 22 | +my $configure_ac; | ||
| 23 | + | ||
| 24 | ## ---------- ## | ||
| 25 | ## Routines. ## | ||
| 26 | ## ---------- ## | ||
| 27 | @@ -153,6 +161,7 @@ | ||
| 28 | 'B|prepend-include=s' => \@prepend_include, | ||
| 29 | 'i|install' => \$install, | ||
| 30 | 's|symlink' => \$symlink, | ||
| 31 | + 'x|exclude=s' => \@exclude, | ||
| 32 | 'm|make' => \$run_make, | ||
| 33 | 'recursive!' => \$recursive); | ||
| 34 | |||
| 35 | @@ -162,6 +171,8 @@ | ||
| 36 | parse_WARNINGS; | ||
| 37 | parse_warnings '--warnings', @warning; | ||
| 38 | |||
| 39 | + @exclude = map { split /,/ } @exclude; | ||
| 40 | + | ||
| 41 | # Even if the user specified a configure.ac, trim to get the | ||
| 42 | # directory, and look for configure.ac again. Because (i) the code | ||
| 43 | # is simpler, and (ii) we are still able to diagnose simultaneous | ||
| 44 | @@ -255,6 +266,11 @@ | ||
| 45 | { | ||
| 46 | my ($aclocal, $flags) = @_; | ||
| 47 | |||
| 48 | + @ex = grep (/^aclocal$/, @exclude); | ||
| 49 | + if ($#ex != -1) { | ||
| 50 | + return; | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | # aclocal 1.8+ does all this for free. It can be recognized by its | ||
| 54 | # --force support. | ||
| 55 | if ($aclocal_supports_force) | ||
| 56 | @@ -368,7 +384,10 @@ | ||
| 57 | } | ||
| 58 | else | ||
| 59 | { | ||
| 60 | - xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); | ||
| 61 | + @ex = grep (/^autopoint$/, @exclude); | ||
| 62 | + if ($#ex == -1) { | ||
| 63 | + xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); | ||
| 64 | + } | ||
| 65 | } | ||
| 66 | |||
| 67 | |||
| 68 | @@ -532,16 +551,17 @@ | ||
| 69 | { | ||
| 70 | $libtoolize .= " --ltdl"; | ||
| 71 | } | ||
| 72 | - xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); | ||
| 73 | - $rerun_aclocal = 1; | ||
| 74 | + @ex = grep (/^libtoolize$/, @exclude); | ||
| 75 | + if ($#ex == -1) { | ||
| 76 | + xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); | ||
| 77 | + $rerun_aclocal = 1; | ||
| 78 | + } | ||
| 79 | } | ||
| 80 | else | ||
| 81 | { | ||
| 82 | verb "$configure_ac: not running libtoolize: --install not given"; | ||
| 83 | } | ||
| 84 | |||
| 85 | - | ||
| 86 | - | ||
| 87 | # ------------------- # | ||
| 88 | # Rerunning aclocal. # | ||
| 89 | # ------------------- # | ||
| 90 | @@ -572,7 +592,10 @@ | ||
| 91 | # latter runs the former, and (ii) autoconf is stricter than | ||
| 92 | # autoheader. So all in all, autoconf should give better error | ||
| 93 | # messages. | ||
| 94 | - xsystem ($autoconf); | ||
| 95 | + @ex = grep (/^autoconf$/, @exclude); | ||
| 96 | + if ($#ex == -1) { | ||
| 97 | + xsystem ("$autoconf"); | ||
| 98 | + } | ||
| 99 | |||
| 100 | |||
| 101 | # -------------------- # | ||
| 102 | @@ -593,7 +616,10 @@ | ||
| 103 | } | ||
| 104 | else | ||
| 105 | { | ||
| 106 | - xsystem ($autoheader); | ||
| 107 | + @ex = grep (/^autoheader$/, @exclude); | ||
| 108 | + if ($#ex == -1) { | ||
| 109 | + xsystem ("$autoheader"); | ||
| 110 | + } | ||
| 111 | } | ||
| 112 | |||
| 113 | |||
| 114 | @@ -610,7 +636,10 @@ | ||
| 115 | # We should always run automake, and let it decide whether it shall | ||
| 116 | # update the file or not. In fact, the effect of `$force' is already | ||
| 117 | # included in `$automake' via `--no-force'. | ||
| 118 | - xsystem ($automake); | ||
| 119 | + @ex = grep (/^automake$/, @exclude); | ||
| 120 | + if ($#ex == -1) { | ||
| 121 | + xsystem ("$automake"); | ||
| 122 | + } | ||
| 123 | } | ||
| 124 | |||
| 125 | |||
| 126 | @@ -634,7 +663,10 @@ | ||
| 127 | } | ||
| 128 | else | ||
| 129 | { | ||
| 130 | - xsystem ("$make"); | ||
| 131 | + @ex = grep (/^make$/, @exclude); | ||
| 132 | + if ($#ex == -1) { | ||
| 133 | + xsystem ("$make"); | ||
| 134 | + } | ||
| 135 | } | ||
| 136 | } | ||
| 137 | } | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch new file mode 100644 index 0000000000..587a823826 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | --- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 | ||
| 2 | +++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 | ||
| 3 | @@ -184,6 +184,8 @@ | ||
| 4 | |||
| 5 | $aclocal_supports_force = `$aclocal --help` =~ /--force/; | ||
| 6 | |||
| 7 | + $automake .= ' --foreign'; | ||
| 8 | + | ||
| 9 | # Dispatch autoreconf's option to the tools. | ||
| 10 | # --include; | ||
| 11 | $autoconf .= join (' --include=', '', @include); | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch new file mode 100644 index 0000000000..851d24330d --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
| 4 | # | ||
| 5 | |||
| 6 | Index: autoconf-2.63/bin/autoreconf.in | ||
| 7 | =================================================================== | ||
| 8 | --- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:43:55.000000000 +0000 | ||
| 9 | +++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:46:16.000000000 +0000 | ||
| 10 | @@ -58,7 +58,7 @@ | ||
| 11 | $help = "Usage: $0 [OPTION]... [DIRECTORY]... | ||
| 12 | |||
| 13 | Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' | ||
| 14 | -(formerly `gettextize'), and `libtoolize' where appropriate) | ||
| 15 | +(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) | ||
| 16 | repeatedly to remake the GNU Build System files in specified | ||
| 17 | DIRECTORIES and their subdirectories (defaulting to `.'). | ||
| 18 | |||
| 19 | @@ -115,6 +115,7 @@ | ||
| 20 | my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; | ||
| 21 | my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; | ||
| 22 | my $make = $ENV{'MAKE'} || 'make'; | ||
| 23 | +my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; | ||
| 24 | |||
| 25 | # --install -- as --add-missing in other tools. | ||
| 26 | my $install = 0; | ||
| 27 | @@ -644,6 +645,10 @@ | ||
| 28 | } | ||
| 29 | } | ||
| 30 | |||
| 31 | + @ex = grep (/^gnu-configize$/, @exclude); | ||
| 32 | + if ($#ex == -1) { | ||
| 33 | + xsystem ("$gnuconfigize"); | ||
| 34 | + } | ||
| 35 | |||
| 36 | # -------------- # | ||
| 37 | # Running make. # | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch new file mode 100644 index 0000000000..08646c10af --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | Index: autoconf-2.63/bin/autoreconf.in | ||
| 2 | =================================================================== | ||
| 3 | --- autoconf-2.63.orig/bin/autoreconf.in 2008-08-28 03:08:10.000000000 +0100 | ||
| 4 | +++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:38:40.000000000 +0000 | ||
| 5 | @@ -190,6 +190,7 @@ | ||
| 6 | $autoconf .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); | ||
| 7 | $autoheader .= join (' --include=', '', map { shell_quote ($_) } @include); | ||
| 8 | $autoheader .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); | ||
| 9 | + $aclocal .= join (' -I ', '', map { shell_quote ($_) } @include); | ||
| 10 | |||
| 11 | # --install and --symlink; | ||
| 12 | if ($install) | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch new file mode 100644 index 0000000000..8a90cd3307 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | Poky provides a list of site files in CONFIG_SITE whereas autoconf | ||
| 2 | only expects one file. This patch changes autoconf to accept a list of | ||
| 3 | them. | ||
| 4 | |||
| 5 | RP 1/2/10 | ||
| 6 | |||
| 7 | Index: autoconf-2.65/lib/autoconf/general.m4 | ||
| 8 | =================================================================== | ||
| 9 | --- autoconf-2.65.orig/lib/autoconf/general.m4 2010-02-01 12:41:32.329073138 +0000 | ||
| 10 | +++ autoconf-2.65/lib/autoconf/general.m4 2010-02-01 12:41:56.769040799 +0000 | ||
| 11 | @@ -1863,17 +1863,10 @@ | ||
| 12 | m4_define([AC_SITE_LOAD], | ||
| 13 | [# Prefer an explicitly selected file to automatically selected ones. | ||
| 14 | ac_site_file1=NONE | ||
| 15 | -ac_site_file2=NONE | ||
| 16 | if test -n "$CONFIG_SITE"; then | ||
| 17 | ac_site_file1=$CONFIG_SITE | ||
| 18 | -elif test "x$prefix" != xNONE; then | ||
| 19 | - ac_site_file1=$prefix/share/config.site | ||
| 20 | - ac_site_file2=$prefix/etc/config.site | ||
| 21 | -else | ||
| 22 | - ac_site_file1=$ac_default_prefix/share/config.site | ||
| 23 | - ac_site_file2=$ac_default_prefix/etc/config.site | ||
| 24 | fi | ||
| 25 | -for ac_site_file in "$ac_site_file1" "$ac_site_file2" | ||
| 26 | +for ac_site_file in $ac_site_file1 | ||
| 27 | do | ||
| 28 | test "x$ac_site_file" = xNONE && continue | ||
| 29 | if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then | ||
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 | *\'*) | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch new file mode 100644 index 0000000000..5f0d055a48 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch | |||
| @@ -0,0 +1,126 @@ | |||
| 1 | Index: autoconf-2.59/bin/autoheader.in | ||
| 2 | =================================================================== | ||
| 3 | --- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500 | ||
| 4 | +++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500 | ||
| 5 | @@ -1,8 +1,8 @@ | ||
| 6 | -#! @PERL@ | ||
| 7 | +#! @bindir@/env perl | ||
| 8 | # -*- Perl -*- | ||
| 9 | # @configure_input@ | ||
| 10 | |||
| 11 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 12 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' | ||
| 13 | if 0; | ||
| 14 | |||
| 15 | # autoheader -- create `config.h.in' from `configure.ac' | ||
| 16 | Index: autoconf-2.59/bin/autom4te.in | ||
| 17 | =================================================================== | ||
| 18 | --- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500 | ||
| 19 | +++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500 | ||
| 20 | @@ -1,8 +1,10 @@ | ||
| 21 | -#! @PERL@ -w | ||
| 22 | +#! @bindir@/env perl | ||
| 23 | # -*- perl -*- | ||
| 24 | # @configure_input@ | ||
| 25 | |||
| 26 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 27 | +use warnings; | ||
| 28 | + | ||
| 29 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 30 | if 0; | ||
| 31 | |||
| 32 | # autom4te - Wrapper around M4 libraries. | ||
| 33 | @@ -87,7 +89,7 @@ | ||
| 34 | my $freeze = 0; | ||
| 35 | |||
| 36 | # $M4. | ||
| 37 | -my $m4 = $ENV{"M4"} || '@M4@'; | ||
| 38 | +my $m4 = $ENV{"M4"} || '@bindir@/env m4'; | ||
| 39 | # Some non-GNU m4's don't reject the --help option, so give them /dev/null. | ||
| 40 | fatal "need GNU m4 1.4 or later: $m4" | ||
| 41 | if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null"; | ||
| 42 | Index: autoconf-2.59/bin/autoreconf.in | ||
| 43 | =================================================================== | ||
| 44 | --- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500 | ||
| 45 | +++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500 | ||
| 46 | @@ -1,8 +1,10 @@ | ||
| 47 | -#! @PERL@ -w | ||
| 48 | +#! @bindir@/env perl | ||
| 49 | # -*- perl -*- | ||
| 50 | # @configure_input@ | ||
| 51 | |||
| 52 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 53 | +use warnings; | ||
| 54 | + | ||
| 55 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 56 | if 0; | ||
| 57 | |||
| 58 | # autoreconf - install the GNU Build System in a directory tree | ||
| 59 | Index: autoconf-2.59/bin/autoscan.in | ||
| 60 | =================================================================== | ||
| 61 | --- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400 | ||
| 62 | +++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500 | ||
| 63 | @@ -1,4 +1,4 @@ | ||
| 64 | -#! @PERL@ -w | ||
| 65 | +#! @bindir@/env perl | ||
| 66 | # -*- perl -*- | ||
| 67 | # autoscan - Create configure.scan (a preliminary configure.ac) for a package. | ||
| 68 | # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 | ||
| 69 | @@ -21,7 +21,9 @@ | ||
| 70 | |||
| 71 | # Written by David MacKenzie <djm@gnu.ai.mit.edu>. | ||
| 72 | |||
| 73 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 74 | +use warnings; | ||
| 75 | + | ||
| 76 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 77 | if 0; | ||
| 78 | |||
| 79 | BEGIN | ||
| 80 | Index: autoconf-2.59/bin/autoupdate.in | ||
| 81 | =================================================================== | ||
| 82 | --- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400 | ||
| 83 | +++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500 | ||
| 84 | @@ -1,4 +1,4 @@ | ||
| 85 | -#! @PERL@ -w | ||
| 86 | +#! @bindir@/env perl | ||
| 87 | # -*- perl -*- | ||
| 88 | # autoupdate - modernize an Autoconf file. | ||
| 89 | # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 | ||
| 90 | @@ -22,7 +22,9 @@ | ||
| 91 | # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>. | ||
| 92 | # Rewritten by Akim Demaille <akim@freefriends.org>. | ||
| 93 | |||
| 94 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 95 | +use warnings; | ||
| 96 | + | ||
| 97 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 98 | if 0; | ||
| 99 | |||
| 100 | BEGIN | ||
| 101 | @@ -54,7 +56,7 @@ | ||
| 102 | my @include = ('@datadir@'); | ||
| 103 | my $force = 0; | ||
| 104 | # m4. | ||
| 105 | -my $m4 = $ENV{"M4"} || '@M4@'; | ||
| 106 | +my $m4 = $ENV{"M4"} || '@bindir@/env m4'; | ||
| 107 | |||
| 108 | |||
| 109 | # $HELP | ||
| 110 | Index: autoconf-2.59/bin/ifnames.in | ||
| 111 | =================================================================== | ||
| 112 | --- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400 | ||
| 113 | +++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500 | ||
| 114 | @@ -1,8 +1,10 @@ | ||
| 115 | -#! @PERL@ -w | ||
| 116 | +#! @bindir@/env perl | ||
| 117 | # -*- perl -*- | ||
| 118 | # @configure_input@ | ||
| 119 | |||
| 120 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 121 | +use warnings; | ||
| 122 | + | ||
| 123 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 124 | if 0; | ||
| 125 | |||
| 126 | # ifnames - print the identifiers used in C preprocessor conditionals | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch new file mode 100644 index 0000000000..e6f4096a97 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
| 4 | # | ||
| 5 | |||
| 6 | --- autoconf-2.57/lib/autoconf/general.m4~program_prefix | ||
| 7 | +++ autoconf-2.57/lib/autoconf/general.m4 | ||
| 8 | @@ -1676,8 +1676,9 @@ | ||
| 9 | # The aliases save the names the user supplied, while $host etc. | ||
| 10 | # will get canonicalized. | ||
| 11 | test -n "$target_alias" && | ||
| 12 | - test "$program_prefix$program_suffix$program_transform_name" = \ | ||
| 13 | - NONENONEs,x,x, && | ||
| 14 | + test "$target_alias" != "$host_alias" && | ||
| 15 | + test "$program_prefix$program_suffix$program_transform_name" = \ | ||
| 16 | + NONENONEs,x,x, && | ||
| 17 | program_prefix=${target_alias}-[]dnl | ||
| 18 | ])# AC_CANONICAL_TARGET | ||
| 19 | |||
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc new file mode 100644 index 0000000000..8816a66d32 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf.inc | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | DESCRIPTION = "A package of M4 macros to produce scripts to \ | ||
| 2 | automatically configure sourcecode." | ||
| 3 | LICENSE = "GPLv3" | ||
| 4 | HOMEPAGE = "http://www.gnu.org/software/autoconf/" | ||
| 5 | SECTION = "devel" | ||
| 6 | DEPENDS += "m4-native" | ||
| 7 | RDEPENDS_${PN} = "m4 gnu-config" | ||
| 8 | |||
| 9 | SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ | ||
| 10 | file://program_prefix.patch;patch=1" | ||
| 11 | |||
| 12 | inherit autotools | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.65.bb b/meta/recipes-devtools/autoconf/autoconf_2.65.bb new file mode 100644 index 0000000000..5adb9756d1 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf_2.65.bb | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | require autoconf.inc | ||
| 2 | |||
| 3 | PR = "r2" | ||
| 4 | |||
| 5 | PARALLEL_MAKE = "" | ||
| 6 | |||
| 7 | DEPENDS += "m4-native" | ||
| 8 | RDEPENDS_${PN} = "m4 gnu-config" | ||
| 9 | |||
| 10 | SRC_URI += "file://autoreconf-include.patch;patch=1 \ | ||
| 11 | file://autoreconf-exclude.patch;patch=1 \ | ||
| 12 | file://autoreconf-foreign.patch;patch=1 \ | ||
| 13 | file://autoreconf-gnuconfigize.patch;patch=1 \ | ||
| 14 | file://autoheader-nonfatal-warnings.patch;patch=1 \ | ||
| 15 | ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \ | ||
| 16 | file://config_site.patch;patch=1" | ||
| 17 | |||
| 18 | DEPENDS_virtclass-native = "m4-native gnu-config-native" | ||
| 19 | RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" | ||
| 20 | |||
| 21 | SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1" | ||
| 22 | |||
| 23 | BBCLASSEXTEND = "native" | ||
