From aa24c1eda4b33b329d330c8bbb6d243dfd924f62 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 24 May 2011 09:38:17 -0700 Subject: autoconf: upgrade from 2.65 to 2.68 And rebase the patches to the newer code. Signed-off-by: Nitin A Kamble --- .../autoconf/autoconf-2.65/autoconf-x.patch | 38 ------ .../autoheader-nonfatal-warnings.patch | 15 --- .../autoconf-2.65/autoreconf-exclude.patch | 139 --------------------- .../autoconf-2.65/autoreconf-foreign.patch | 13 -- .../autoconf-2.65/autoreconf-gnuconfigize.patch | 38 ------ .../autoconf-2.65/autoreconf-include.patch | 14 --- .../autoconf/autoconf-2.65/config_site.patch | 31 ----- .../autoconf/autoconf-2.65/fix_path_xtra.patch | 120 ------------------ .../autoconf/autoconf-2.65/path_prog_fixes.patch | 128 ------------------- .../autoconf/autoconf-2.65/program_prefix.patch | 20 --- .../autoconf/autoconf/autoconf-x.patch | 38 ++++++ .../autoconf/autoheader-nonfatal-warnings.patch | 15 +++ .../autoconf/autoconf/autoreconf-exclude.patch | 139 +++++++++++++++++++++ .../autoconf/autoconf/autoreconf-foreign.patch | 13 ++ .../autoconf/autoreconf-gnuconfigize.patch | 38 ++++++ .../autoconf/autoconf/autoreconf-include.patch | 14 +++ .../autoconf/autoconf/config_site.patch | 40 ++++++ .../autoconf/autoconf/fix_path_xtra.patch | 120 ++++++++++++++++++ .../autoconf/autoconf/path_prog_fixes.patch | 128 +++++++++++++++++++ .../autoconf/autoconf/program_prefix.patch | 20 +++ meta/recipes-devtools/autoconf/autoconf_2.65.bb | 28 ----- meta/recipes-devtools/autoconf/autoconf_2.68.bb | 28 +++++ 22 files changed, 593 insertions(+), 584 deletions(-) delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/config_site.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/program_prefix.patch delete mode 100644 meta/recipes-devtools/autoconf/autoconf_2.65.bb create mode 100644 meta/recipes-devtools/autoconf/autoconf_2.68.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch deleted file mode 100644 index 6ebef0a540..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Pending - -Index: lib/autoconf/libs.m4 -=================================================================== -RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v -retrieving revision 1.13 -diff -p -u -r1.13 libs.m4 ---- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 -+++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 -@@ -265,13 +265,13 @@ ac_x_header_dirs=' - /usr/openwin/share/include' - - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. -- AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], -+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], - [# We can compile using X headers with no special include directory. - ac_x_includes=], - [for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -@@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS -- LIBS="-lXt $LIBS" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], -- [XtMalloc (0)])], -+ LIBS="-lX11 $LIBS" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], -+ [XrmInitialize ()])], - [LIBS=$ac_save_LIBS - # We can link X programs with no special library path. - 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 deleted file mode 100644 index 8ae6d5c8aa..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - ---- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100 -+++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100 -@@ -272,8 +272,8 @@ - } - - } -- exit 1 -- if keys %symbol; -+# exit 1 -+# if keys %symbol; - } - - 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 deleted file mode 100644 index d1bd3a2a31..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch +++ /dev/null @@ -1,139 +0,0 @@ -Upstream-Status: Pending - -Index: autoconf-2.63/bin/autoreconf.in -=================================================================== ---- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:39:01.000000000 +0000 -+++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:43:38.000000000 +0000 -@@ -76,6 +76,7 @@ - -i, --install copy missing auxiliary files - --no-recursive don't rebuild sub-packages - -s, --symlink with -i, install symbolic links instead of copies -+ -x, --exclude=STEPS steps we should not run - -m, --make when applicable, re-run ./configure && make - -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] - -@@ -136,6 +137,13 @@ - # Recurse into subpackages - my $recursive = 1; - -+# Steps to exclude -+my @exclude; -+my @ex; -+ -+my $uses_gettext; -+my $configure_ac; -+ - ## ---------- ## - ## Routines. ## - ## ---------- ## -@@ -153,6 +161,7 @@ - 'B|prepend-include=s' => \@prepend_include, - 'i|install' => \$install, - 's|symlink' => \$symlink, -+ 'x|exclude=s' => \@exclude, - 'm|make' => \$run_make, - 'recursive!' => \$recursive); - -@@ -162,6 +171,8 @@ - parse_WARNINGS; - parse_warnings '--warnings', @warning; - -+ @exclude = map { split /,/ } @exclude; -+ - # Even if the user specified a configure.ac, trim to get the - # directory, and look for configure.ac again. Because (i) the code - # is simpler, and (ii) we are still able to diagnose simultaneous -@@ -255,6 +266,11 @@ - { - my ($aclocal, $flags) = @_; - -+ @ex = grep (/^aclocal$/, @exclude); -+ if ($#ex != -1) { -+ return; -+ } -+ - # aclocal 1.8+ does all this for free. It can be recognized by its - # --force support. - if ($aclocal_supports_force) -@@ -368,7 +384,10 @@ - } - else - { -- xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); -+ @ex = grep (/^autopoint$/, @exclude); -+ if ($#ex == -1) { -+ xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); -+ } - } - - -@@ -532,16 +551,17 @@ - { - $libtoolize .= " --ltdl"; - } -- xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); -- $rerun_aclocal = 1; -+ @ex = grep (/^libtoolize$/, @exclude); -+ if ($#ex == -1) { -+ xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); -+ $rerun_aclocal = 1; -+ } - } - else - { - verb "$configure_ac: not running libtoolize: --install not given"; - } - -- -- - # ------------------- # - # Rerunning aclocal. # - # ------------------- # -@@ -572,7 +592,10 @@ - # latter runs the former, and (ii) autoconf is stricter than - # autoheader. So all in all, autoconf should give better error - # messages. -- xsystem ($autoconf); -+ @ex = grep (/^autoconf$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$autoconf"); -+ } - - - # -------------------- # -@@ -593,7 +616,10 @@ - } - else - { -- xsystem ($autoheader); -+ @ex = grep (/^autoheader$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$autoheader"); -+ } - } - - -@@ -610,7 +636,10 @@ - # We should always run automake, and let it decide whether it shall - # update the file or not. In fact, the effect of `$force' is already - # included in `$automake' via `--no-force'. -- xsystem ($automake); -+ @ex = grep (/^automake$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$automake"); -+ } - } - - -@@ -634,7 +663,10 @@ - } - else - { -- xsystem ("$make"); -+ @ex = grep (/^make$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$make"); -+ } - } - } - } diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch deleted file mode 100644 index 88f750195d..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Pending - ---- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 -+++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 -@@ -184,6 +184,8 @@ - - $aclocal_supports_force = `$aclocal --help` =~ /--force/; - -+ $automake .= ' --foreign'; -+ - # Dispatch autoreconf's option to the tools. - # --include; - $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 deleted file mode 100644 index 5ff18c2350..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Pending - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: autoconf-2.63/bin/autoreconf.in -=================================================================== ---- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:43:55.000000000 +0000 -+++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:46:16.000000000 +0000 -@@ -58,7 +58,7 @@ - $help = "Usage: $0 [OPTION]... [DIRECTORY]... - - Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' --(formerly `gettextize'), and `libtoolize' where appropriate) -+(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) - repeatedly to remake the GNU Build System files in specified - DIRECTORIES and their subdirectories (defaulting to `.'). - -@@ -115,6 +115,7 @@ - my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; - my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; - my $make = $ENV{'MAKE'} || 'make'; -+my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; - - # --install -- as --add-missing in other tools. - my $install = 0; -@@ -644,6 +645,10 @@ - } - } - -+ @ex = grep (/^gnu-configize$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$gnuconfigize"); -+ } - - # -------------- # - # 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 deleted file mode 100644 index 31326f0bc8..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - -Index: autoconf-2.63/bin/autoreconf.in -=================================================================== ---- autoconf-2.63.orig/bin/autoreconf.in 2008-08-28 03:08:10.000000000 +0100 -+++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:38:40.000000000 +0000 -@@ -190,6 +190,7 @@ - $autoconf .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); - $autoheader .= join (' --include=', '', map { shell_quote ($_) } @include); - $autoheader .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); -+ $aclocal .= join (' -I ', '', map { shell_quote ($_) } @include); - - # --install and --symlink; - 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 deleted file mode 100644 index e3ff318bbe..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending - -Poky provides a list of site files in CONFIG_SITE whereas autoconf -only expects one file. This patch changes autoconf to accept a list of -them. - -RP 1/2/10 - -Index: autoconf-2.65/lib/autoconf/general.m4 -=================================================================== ---- autoconf-2.65.orig/lib/autoconf/general.m4 2010-02-01 12:41:32.329073138 +0000 -+++ autoconf-2.65/lib/autoconf/general.m4 2010-02-01 12:41:56.769040799 +0000 -@@ -1863,17 +1863,10 @@ - m4_define([AC_SITE_LOAD], - [# Prefer an explicitly selected file to automatically selected ones. - ac_site_file1=NONE --ac_site_file2=NONE - if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE --elif test "x$prefix" != xNONE; then -- ac_site_file1=$prefix/share/config.site -- ac_site_file2=$prefix/etc/config.site --else -- ac_site_file1=$ac_default_prefix/share/config.site -- ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+for ac_site_file in $ac_site_file1 - do - test "x$ac_site_file" = xNONE && continue - 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 deleted file mode 100644 index 29fe6a27bb..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch +++ /dev/null @@ -1,120 +0,0 @@ -Upstream-Status: Pending - -We don't build xmkmf so any values returned from it are going to be wrong. -Using any paths in /usr/ for x headers/libs is a bad idea when cross compiling. -This patch removes them to stop any confusion. - -RP - 20071115 - -Index: autoconf-2.65/lib/autoconf/libs.m4 -=================================================================== ---- autoconf-2.65.orig/lib/autoconf/libs.m4 2009-10-29 01:53:41.000000000 +0000 -+++ autoconf-2.65/lib/autoconf/libs.m4 2010-01-29 13:40:13.000000000 +0000 -@@ -159,53 +159,6 @@ - # --------------------- # - - --# _AC_PATH_X_XMKMF --# ---------------- --# Internal subroutine of _AC_PATH_X. --# Set ac_x_includes and/or ac_x_libraries. --m4_define([_AC_PATH_X_XMKMF], --[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl --rm -f -r conftest.dir --if mkdir conftest.dir; then -- cd conftest.dir -- cat >Imakefile <<'_ACEOF' --incroot: -- @echo incroot='${INCROOT}' --usrlibdir: -- @echo usrlibdir='${USRLIBDIR}' --libdir: -- @echo libdir='${LIBDIR}' --_ACEOF -- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then -- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -- for ac_var in incroot usrlibdir libdir; do -- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" -- done -- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -- for ac_extension in a so sl dylib la dll; do -- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && -- test -f "$ac_im_libdir/libX11.$ac_extension"; then -- ac_im_usrlibdir=$ac_im_libdir; break -- fi -- done -- # Screen out bogus values from the imake configuration. They are -- # bogus both because they are the default anyway, and because -- # using them would break gcc on systems where it needs fixed includes. -- case $ac_im_incroot in -- /usr/include) ac_x_includes= ;; -- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; -- esac -- case $ac_im_usrlibdir in -- /usr/lib | /usr/lib64 | /lib | /lib64) ;; -- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; -- esac -- fi -- cd .. -- rm -f -r conftest.dir --fi --])# _AC_PATH_X_XMKMF -- -- - # _AC_PATH_X_DIRECT - # ----------------- - # Internal subroutine of _AC_PATH_X. -@@ -213,44 +166,7 @@ - m4_define([_AC_PATH_X_DIRECT], - [# Standard set of common directories for X headers. - # Check X11 before X11Rn because it is often a symlink to the current release. --ac_x_header_dirs=' --/usr/X11/include --/usr/X11R7/include --/usr/X11R6/include --/usr/X11R5/include --/usr/X11R4/include -- --/usr/include/X11 --/usr/include/X11R7 --/usr/include/X11R6 --/usr/include/X11R5 --/usr/include/X11R4 -- --/usr/local/X11/include --/usr/local/X11R7/include --/usr/local/X11R6/include --/usr/local/X11R5/include --/usr/local/X11R4/include -- --/usr/local/include/X11 --/usr/local/include/X11R7 --/usr/local/include/X11R6 --/usr/local/include/X11R5 --/usr/local/include/X11R4 -- --/usr/X386/include --/usr/x386/include --/usr/XFree86/include/X11 -- --/usr/include --/usr/local/include --/usr/unsupported/include --/usr/athena/include --/usr/local/x11r5/include --/usr/lpp/Xamples/include -- --/usr/openwin/include --/usr/openwin/share/include' -+ac_x_header_dirs='' - - if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. -@@ -299,7 +215,6 @@ - [AC_CACHE_VAL(ac_cv_have_x, - [# One or both of the vars are not set, and there is no cached value. - ac_x_includes=no ac_x_libraries=no --_AC_PATH_X_XMKMF - _AC_PATH_X_DIRECT - case $ac_x_includes,$ac_x_libraries in #( - 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 deleted file mode 100644 index cb57dfdfe7..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch +++ /dev/null @@ -1,128 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Index: autoconf-2.59/bin/autoheader.in -=================================================================== ---- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500 -+++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500 -@@ -1,8 +1,8 @@ --#! @PERL@ -+#! @bindir@/env perl - # -*- Perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' -+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' - if 0; - - # autoheader -- create `config.h.in' from `configure.ac' -Index: autoconf-2.59/bin/autom4te.in -=================================================================== ---- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500 -+++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500 -@@ -1,8 +1,10 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' - if 0; - - # autom4te - Wrapper around M4 libraries. -@@ -87,7 +89,7 @@ - my $freeze = 0; - - # $M4. --my $m4 = $ENV{"M4"} || '@M4@'; -+my $m4 = $ENV{"M4"} || '@bindir@/env m4'; - # Some non-GNU m4's don't reject the --help option, so give them /dev/null. - fatal "need GNU m4 1.4 or later: $m4" - if system "$m4 --help &1 | grep reload-state >/dev/null"; -Index: autoconf-2.59/bin/autoreconf.in -=================================================================== ---- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500 -+++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500 -@@ -1,8 +1,10 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' - if 0; - - # autoreconf - install the GNU Build System in a directory tree -Index: autoconf-2.59/bin/autoscan.in -=================================================================== ---- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400 -+++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500 -@@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # autoscan - Create configure.scan (a preliminary configure.ac) for a package. - # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 -@@ -21,7 +21,9 @@ - - # Written by David MacKenzie . - --eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' - if 0; - - BEGIN -Index: autoconf-2.59/bin/autoupdate.in -=================================================================== ---- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400 -+++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500 -@@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # autoupdate - modernize an Autoconf file. - # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 -@@ -22,7 +22,9 @@ - # Originally written by David MacKenzie . - # Rewritten by Akim Demaille . - --eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' - if 0; - - BEGIN -@@ -54,7 +56,7 @@ - my @include = ('@datadir@'); - my $force = 0; - # m4. --my $m4 = $ENV{"M4"} || '@M4@'; -+my $m4 = $ENV{"M4"} || '@bindir@/env m4'; - - - # $HELP -Index: autoconf-2.59/bin/ifnames.in -=================================================================== ---- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400 -+++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500 -@@ -1,8 +1,10 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' - if 0; - - # 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 deleted file mode 100644 index 978a401f0a..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream-Status: Pending - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- autoconf-2.57/lib/autoconf/general.m4~program_prefix -+++ autoconf-2.57/lib/autoconf/general.m4 -@@ -1676,8 +1676,9 @@ - # The aliases save the names the user supplied, while $host etc. - # will get canonicalized. - test -n "$target_alias" && -- test "$program_prefix$program_suffix$program_transform_name" = \ -- NONENONEs,x,x, && -+ test "$target_alias" != "$host_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && - program_prefix=${target_alias}-[]dnl - ])# AC_CANONICAL_TARGET - 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 @@ +Upstream-Status: Pending + +Index: lib/autoconf/libs.m4 +=================================================================== +RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v +retrieving revision 1.13 +diff -p -u -r1.13 libs.m4 +--- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 ++++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 +@@ -265,13 +265,13 @@ ac_x_header_dirs=' + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. +- AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], ++ AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], + [# We can compile using X headers with no special include directory. + ac_x_includes=], + [for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS +- LIBS="-lXt $LIBS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], +- [XtMalloc (0)])], ++ LIBS="-lX11 $LIBS" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], ++ [XrmInitialize ()])], + [LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + 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 @@ +Upstream-Status: Pending + +--- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100 ++++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100 +@@ -272,8 +272,8 @@ + } + + } +- exit 1 +- if keys %symbol; ++# exit 1 ++# if keys %symbol; + } + + 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 @@ +Upstream-Status: Pending + +Index: autoconf-2.63/bin/autoreconf.in +=================================================================== +--- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:39:01.000000000 +0000 ++++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:43:38.000000000 +0000 +@@ -76,6 +76,7 @@ + -i, --install copy missing auxiliary files + --no-recursive don't rebuild sub-packages + -s, --symlink with -i, install symbolic links instead of copies ++ -x, --exclude=STEPS steps we should not run + -m, --make when applicable, re-run ./configure && make + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] + +@@ -136,6 +137,13 @@ + # Recurse into subpackages + my $recursive = 1; + ++# Steps to exclude ++my @exclude; ++my @ex; ++ ++my $uses_gettext; ++my $configure_ac; ++ + ## ---------- ## + ## Routines. ## + ## ---------- ## +@@ -153,6 +161,7 @@ + 'B|prepend-include=s' => \@prepend_include, + 'i|install' => \$install, + 's|symlink' => \$symlink, ++ 'x|exclude=s' => \@exclude, + 'm|make' => \$run_make, + 'recursive!' => \$recursive); + +@@ -162,6 +171,8 @@ + parse_WARNINGS; + parse_warnings '--warnings', @warning; + ++ @exclude = map { split /,/ } @exclude; ++ + # Even if the user specified a configure.ac, trim to get the + # directory, and look for configure.ac again. Because (i) the code + # is simpler, and (ii) we are still able to diagnose simultaneous +@@ -255,6 +266,11 @@ + { + my ($aclocal, $flags) = @_; + ++ @ex = grep (/^aclocal$/, @exclude); ++ if ($#ex != -1) { ++ return; ++ } ++ + # aclocal 1.8+ does all this for free. It can be recognized by its + # --force support. + if ($aclocal_supports_force) +@@ -368,7 +384,10 @@ + } + else + { +- xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); ++ @ex = grep (/^autopoint$/, @exclude); ++ if ($#ex == -1) { ++ xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); ++ } + } + + +@@ -532,16 +551,17 @@ + { + $libtoolize .= " --ltdl"; + } +- xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); +- $rerun_aclocal = 1; ++ @ex = grep (/^libtoolize$/, @exclude); ++ if ($#ex == -1) { ++ xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); ++ $rerun_aclocal = 1; ++ } + } + else + { + verb "$configure_ac: not running libtoolize: --install not given"; + } + +- +- + # ------------------- # + # Rerunning aclocal. # + # ------------------- # +@@ -572,7 +592,10 @@ + # latter runs the former, and (ii) autoconf is stricter than + # autoheader. So all in all, autoconf should give better error + # messages. +- xsystem ($autoconf); ++ @ex = grep (/^autoconf$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("$autoconf"); ++ } + + + # -------------------- # +@@ -593,7 +616,10 @@ + } + else + { +- xsystem ($autoheader); ++ @ex = grep (/^autoheader$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("$autoheader"); ++ } + } + + +@@ -610,7 +636,10 @@ + # We should always run automake, and let it decide whether it shall + # update the file or not. In fact, the effect of `$force' is already + # included in `$automake' via `--no-force'. +- xsystem ($automake); ++ @ex = grep (/^automake$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("$automake"); ++ } + } + + +@@ -634,7 +663,10 @@ + } + else + { +- xsystem ("$make"); ++ @ex = grep (/^make$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("$make"); ++ } + } + } + } 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 @@ +Upstream-Status: Pending + +--- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 ++++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 +@@ -184,6 +184,8 @@ + + $aclocal_supports_force = `$aclocal --help` =~ /--force/; + ++ $automake .= ' --foreign'; ++ + # Dispatch autoreconf's option to the tools. + # --include; + $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 @@ +Upstream-Status: Pending + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +Index: autoconf-2.63/bin/autoreconf.in +=================================================================== +--- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:43:55.000000000 +0000 ++++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:46:16.000000000 +0000 +@@ -58,7 +58,7 @@ + $help = "Usage: $0 [OPTION]... [DIRECTORY]... + + Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' +-(formerly `gettextize'), and `libtoolize' where appropriate) ++(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) + repeatedly to remake the GNU Build System files in specified + DIRECTORIES and their subdirectories (defaulting to `.'). + +@@ -115,6 +115,7 @@ + my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; + my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; + my $make = $ENV{'MAKE'} || 'make'; ++my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; + + # --install -- as --add-missing in other tools. + my $install = 0; +@@ -644,6 +645,10 @@ + } + } + ++ @ex = grep (/^gnu-configize$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("$gnuconfigize"); ++ } + + # -------------- # + # 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 @@ +Upstream-Status: Pending + +Index: autoconf-2.63/bin/autoreconf.in +=================================================================== +--- autoconf-2.63.orig/bin/autoreconf.in 2008-08-28 03:08:10.000000000 +0100 ++++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:38:40.000000000 +0000 +@@ -190,6 +190,7 @@ + $autoconf .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); + $autoheader .= join (' --include=', '', map { shell_quote ($_) } @include); + $autoheader .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); ++ $aclocal .= join (' -I ', '', map { shell_quote ($_) } @include); + + # --install and --symlink; + 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 @@ +Upstream-Status: Pending + +Poky provides a list of site files in CONFIG_SITE whereas autoconf +only expects one file. This patch changes autoconf to accept a list of +them. + +RP 1/2/10 + +Updated for 2.68 version: the CONFIG_SITE var was not getting used at all +fixed the 2.68 code +Nitin A Kamble 2011/05/27 + +Index: autoconf-2.68/lib/autoconf/general.m4 +=================================================================== +--- autoconf-2.68.orig/lib/autoconf/general.m4 ++++ autoconf-2.68/lib/autoconf/general.m4 +@@ -1878,7 +1878,6 @@ AU_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPL + m4_define([AC_SITE_LOAD], + [# Prefer an explicitly selected file to automatically selected ones. + ac_site_file1=NONE +-ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in @%:@(( +@@ -1886,14 +1885,8 @@ if test -n "$CONFIG_SITE"; then + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +-elif test "x$prefix" != xNONE; then +- ac_site_file1=$prefix/share/config.site +- ac_site_file2=$prefix/etc/config.site +-else +- ac_site_file1=$ac_default_prefix/share/config.site +- ac_site_file2=$ac_default_prefix/etc/config.site + fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++for ac_site_file in $ac_site_file1 + do + test "x$ac_site_file" = xNONE && continue + 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 @@ +Upstream-Status: Pending + +We don't build xmkmf so any values returned from it are going to be wrong. +Using any paths in /usr/ for x headers/libs is a bad idea when cross compiling. +This patch removes them to stop any confusion. + +RP - 20071115 + +Index: autoconf-2.68/lib/autoconf/libs.m4 +=================================================================== +--- autoconf-2.68.orig/lib/autoconf/libs.m4 ++++ autoconf-2.68/lib/autoconf/libs.m4 +@@ -159,53 +159,6 @@ m4_popdef([AC_Lib_Name])dnl + # --------------------- # + + +-# _AC_PATH_X_XMKMF +-# ---------------- +-# Internal subroutine of _AC_PATH_X. +-# Set ac_x_includes and/or ac_x_libraries. +-m4_define([_AC_PATH_X_XMKMF], +-[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl +-rm -f -r conftest.dir +-if mkdir conftest.dir; then +- cd conftest.dir +- cat >Imakefile <<'_ACEOF' +-incroot: +- @echo incroot='${INCROOT}' +-usrlibdir: +- @echo usrlibdir='${USRLIBDIR}' +-libdir: +- @echo libdir='${LIBDIR}' +-_ACEOF +- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then +- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +- for ac_var in incroot usrlibdir libdir; do +- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" +- done +- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. +- for ac_extension in a so sl dylib la dll; do +- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && +- test -f "$ac_im_libdir/libX11.$ac_extension"; then +- ac_im_usrlibdir=$ac_im_libdir; break +- fi +- done +- # Screen out bogus values from the imake configuration. They are +- # bogus both because they are the default anyway, and because +- # using them would break gcc on systems where it needs fixed includes. +- case $ac_im_incroot in +- /usr/include) ac_x_includes= ;; +- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; +- esac +- case $ac_im_usrlibdir in +- /usr/lib | /usr/lib64 | /lib | /lib64) ;; +- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; +- esac +- fi +- cd .. +- rm -f -r conftest.dir +-fi +-])# _AC_PATH_X_XMKMF +- +- + # _AC_PATH_X_DIRECT + # ----------------- + # Internal subroutine of _AC_PATH_X. +@@ -213,44 +166,7 @@ fi + m4_define([_AC_PATH_X_DIRECT], + [# Standard set of common directories for X headers. + # Check X11 before X11Rn because it is often a symlink to the current release. +-ac_x_header_dirs=' +-/usr/X11/include +-/usr/X11R7/include +-/usr/X11R6/include +-/usr/X11R5/include +-/usr/X11R4/include +- +-/usr/include/X11 +-/usr/include/X11R7 +-/usr/include/X11R6 +-/usr/include/X11R5 +-/usr/include/X11R4 +- +-/usr/local/X11/include +-/usr/local/X11R7/include +-/usr/local/X11R6/include +-/usr/local/X11R5/include +-/usr/local/X11R4/include +- +-/usr/local/include/X11 +-/usr/local/include/X11R7 +-/usr/local/include/X11R6 +-/usr/local/include/X11R5 +-/usr/local/include/X11R4 +- +-/usr/X386/include +-/usr/x386/include +-/usr/XFree86/include/X11 +- +-/usr/include +-/usr/local/include +-/usr/unsupported/include +-/usr/athena/include +-/usr/local/x11r5/include +-/usr/lpp/Xamples/include +- +-/usr/openwin/include +-/usr/openwin/share/include' ++ac_x_header_dirs='' + + if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. +@@ -299,7 +215,6 @@ AC_DEFUN([_AC_PATH_X], + [AC_CACHE_VAL(ac_cv_have_x, + [# One or both of the vars are not set, and there is no cached value. + ac_x_includes=no ac_x_libraries=no +-_AC_PATH_X_XMKMF + _AC_PATH_X_DIRECT + case $ac_x_includes,$ac_x_libraries in #( + 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 @@ +Upstream-Status: Inappropriate [embedded specific] + +Index: autoconf-2.59/bin/autoheader.in +=================================================================== +--- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500 ++++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500 +@@ -1,8 +1,8 @@ +-#! @PERL@ ++#! @bindir@/env perl + # -*- Perl -*- + # @configure_input@ + +-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' ++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' + if 0; + + # autoheader -- create `config.h.in' from `configure.ac' +Index: autoconf-2.59/bin/autom4te.in +=================================================================== +--- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500 ++++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500 +@@ -1,8 +1,10 @@ +-#! @PERL@ -w ++#! @bindir@/env perl + # -*- perl -*- + # @configure_input@ + +-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' ++use warnings; ++ ++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' + if 0; + + # autom4te - Wrapper around M4 libraries. +@@ -87,7 +89,7 @@ + my $freeze = 0; + + # $M4. +-my $m4 = $ENV{"M4"} || '@M4@'; ++my $m4 = $ENV{"M4"} || '@bindir@/env m4'; + # Some non-GNU m4's don't reject the --help option, so give them /dev/null. + fatal "need GNU m4 1.4 or later: $m4" + if system "$m4 --help &1 | grep reload-state >/dev/null"; +Index: autoconf-2.59/bin/autoreconf.in +=================================================================== +--- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500 ++++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500 +@@ -1,8 +1,10 @@ +-#! @PERL@ -w ++#! @bindir@/env perl + # -*- perl -*- + # @configure_input@ + +-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' ++use warnings; ++ ++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' + if 0; + + # autoreconf - install the GNU Build System in a directory tree +Index: autoconf-2.59/bin/autoscan.in +=================================================================== +--- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400 ++++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500 +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @bindir@/env perl + # -*- perl -*- + # autoscan - Create configure.scan (a preliminary configure.ac) for a package. + # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 +@@ -21,7 +21,9 @@ + + # Written by David MacKenzie . + +-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' ++use warnings; ++ ++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' + if 0; + + BEGIN +Index: autoconf-2.59/bin/autoupdate.in +=================================================================== +--- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400 ++++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500 +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @bindir@/env perl + # -*- perl -*- + # autoupdate - modernize an Autoconf file. + # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 +@@ -22,7 +22,9 @@ + # Originally written by David MacKenzie . + # Rewritten by Akim Demaille . + +-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' ++use warnings; ++ ++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' + if 0; + + BEGIN +@@ -54,7 +56,7 @@ + my @include = ('@datadir@'); + my $force = 0; + # m4. +-my $m4 = $ENV{"M4"} || '@M4@'; ++my $m4 = $ENV{"M4"} || '@bindir@/env m4'; + + + # $HELP +Index: autoconf-2.59/bin/ifnames.in +=================================================================== +--- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400 ++++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500 +@@ -1,8 +1,10 @@ +-#! @PERL@ -w ++#! @bindir@/env perl + # -*- perl -*- + # @configure_input@ + +-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' ++use warnings; ++ ++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' + if 0; + + # 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 @@ +Upstream-Status: Pending + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- autoconf-2.57/lib/autoconf/general.m4~program_prefix ++++ autoconf-2.57/lib/autoconf/general.m4 +@@ -1676,8 +1676,9 @@ + # The aliases save the names the user supplied, while $host etc. + # will get canonicalized. + test -n "$target_alias" && +- test "$program_prefix$program_suffix$program_transform_name" = \ +- NONENONEs,x,x, && ++ test "$target_alias" != "$host_alias" && ++ test "$program_prefix$program_suffix$program_transform_name" = \ ++ NONENONEs,x,x, && + program_prefix=${target_alias}-[]dnl + ])# AC_CANONICAL_TARGET + diff --git a/meta/recipes-devtools/autoconf/autoconf_2.65.bb b/meta/recipes-devtools/autoconf/autoconf_2.65.bb deleted file mode 100644 index 0bc615e58c..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf_2.65.bb +++ /dev/null @@ -1,28 +0,0 @@ -require autoconf.inc - -PR = "r2" - -PARALLEL_MAKE = "" - -DEPENDS += "m4-native" -RDEPENDS_${PN} = "m4 gnu-config" -LICENSE = "GPLv2|GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI += "file://autoreconf-include.patch;patch=1 \ - file://autoreconf-exclude.patch;patch=1 \ - file://autoreconf-foreign.patch;patch=1 \ - file://autoreconf-gnuconfigize.patch;patch=1 \ - file://autoheader-nonfatal-warnings.patch;patch=1 \ - ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \ - file://config_site.patch;patch=1" - -SRC_URI[md5sum] = "a6de1cc6434cd64038b0a0ae4e252b33" -SRC_URI[sha256sum] = "db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b" - -DEPENDS_virtclass-native = "m4-native gnu-config-native" -RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" - -SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb new file mode 100644 index 0000000000..c647a15111 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb @@ -0,0 +1,28 @@ +require autoconf.inc + +PR = "r0" + +PARALLEL_MAKE = "" + +DEPENDS += "m4-native" +RDEPENDS_${PN} = "m4 gnu-config" +LICENSE = "GPLv2|GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" +SRC_URI += "file://autoreconf-include.patch;patch=1 \ + file://autoreconf-exclude.patch;patch=1 \ + file://autoreconf-foreign.patch;patch=1 \ + file://autoreconf-gnuconfigize.patch;patch=1 \ + file://autoheader-nonfatal-warnings.patch;patch=1 \ + ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \ + file://config_site.patch;patch=1" + +SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07" +SRC_URI[sha256sum] = "c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8" + +DEPENDS_virtclass-native = "m4-native gnu-config-native" +RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" + +SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1" + +BBCLASSEXTEND = "native" -- cgit v1.2.3