From: Rene Wagner <rw@handhelds.org>
Date: Sat, 14 Oct 2006 15:55:42 +0000 (+0200)
Subject: autoconf: upgrade to 2.60
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d429aefa5e0defda2b1b7b5eb73bf01605906ae2;p=familiar-h63xx-build.git

autoconf: upgrade to 2.60

Signed-off-by: Rene Wagner <rw@handhelds.org>
---

diff --git a/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoheader-nonfatal-warnings.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoheader-nonfatal-warnings.patch
new file mode 100644
index 0000000..1f18e04
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoheader-nonfatal-warnings.patch
@@ -0,0 +1,13 @@
+--- 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/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-exclude.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-exclude.patch
new file mode 100644
index 0000000..296978a
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-exclude.patch
@@ -0,0 +1,127 @@
+diff -ur autoconf-2.60.orig/bin/autoreconf.in autoconf-2.60/bin/autoreconf.in
+--- autoconf-2.60.orig/bin/autoreconf.in	2006-10-10 01:29:29.000000000 +0200
++++ autoconf-2.60/bin/autoreconf.in	2006-10-10 01:33:02.000000000 +0200
+@@ -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]
+ 
+@@ -133,6 +134,13 @@
+ # Recurse into subpackages
+ my $recursive = 1;
+ 
++# Steps to exclude
++my @exclude;
++my @ex;
++
++my $uses_gettext;
++my $configure_ac;
++
+ ## ---------- ##
+ ## Routines.  ##
+ ## ---------- ##
+@@ -150,6 +158,7 @@
+ 	  'B|prepend-include=s'	 => \@prepend_include,
+ 	  'i|install'            => \$install,
+ 	  's|symlink'            => \$symlink,
++ 	  'x|exclude=s'            => \@exclude,
+ 	  'm|make'               => \$make,
+ 	  'recursive!'           => \$recursive);
+ 
+@@ -159,6 +168,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
+@@ -252,6 +263,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)
+@@ -365,7 +381,10 @@
+     }
+   else
+     {
+-      xsystem "$autopoint";
++      @ex = grep (/^autopoint$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$autopoint");
++      }
+     }
+ 
+ 
+@@ -529,7 +548,10 @@
+         {
+ 	  $libtoolize .= " --ltdl";
+ 	}
+-      xsystem ($libtoolize);
++       @ex = grep (/^libtoolize$/, @exclude);
++       if ($#ex == -1) {
++         xsystem ("$libtoolize");
++       }
+       $rerun_aclocal = 1;
+     }
+   else
+@@ -569,7 +591,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");
++  }
+ 
+ 
+   # -------------------- #
+@@ -590,7 +615,10 @@
+     }
+   else
+     {
+-      xsystem ($autoheader);
++      @ex = grep (/^autoheader$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$autoheader");
++      }
+     }
+ 
+ 
+@@ -607,7 +635,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");
++      }
+     }
+ 
+ 
+@@ -631,7 +662,10 @@
+ 	    }
+ 	  else
+ 	    {
+-	      xsystem ("make");
++              @ex = grep (/^make$/, @exclude);
++              if ($#ex == -1) {
++                xsystem ("make");
++              }
+ 	    }
+ 	}
+     }
+Only in autoconf-2.60.orig/bin: autoreconf.in.orig
diff --git a/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-foreign.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-foreign.patch
new file mode 100644
index 0000000..587a823
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-foreign.patch
@@ -0,0 +1,11 @@
+--- 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/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-gnuconfigize.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-gnuconfigize.patch
new file mode 100644
index 0000000..44896e4
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-gnuconfigize.patch
@@ -0,0 +1,45 @@
+diff -ur autoconf-2.60.orig/bin/autoreconf.in autoconf-2.60/bin/autoreconf.in
+--- autoconf-2.60.orig/bin/autoreconf.in	2006-10-10 01:35:20.000000000 +0200
++++ autoconf-2.60/bin/autoreconf.in	2006-10-10 01:36:52.000000000 +0200
+@@ -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 `.').
+ 
+@@ -106,12 +106,13 @@
+ ";
+ 
+ # Lib files.
+-my $autoconf   = $ENV{'AUTOCONF'}   || '@bindir@/@autoconf-name@';
+-my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
+-my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
+-my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
+-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
+-my $autopoint  = $ENV{'AUTOPOINT'}  || 'autopoint';
++my $autoconf      = $ENV{'AUTOCONF'}     || '@bindir@/@autoconf-name@';
++my $autoheader    = $ENV{'AUTOHEADER'}   || '@bindir@/@autoheader-name@';
++my $automake      = $ENV{'AUTOMAKE'}     || 'automake';
++my $aclocal       = $ENV{'ACLOCAL'}      || 'aclocal';
++my $libtoolize    = $ENV{'LIBTOOLIZE'}   || 'libtoolize';
++my $autopoint     = $ENV{'AUTOPOINT'}    || 'autopoint';
++my $gnuconfigize  = $ENV{'GNUCONFIGIZE'} || 'gnu-configize';
+ 
+ # --install -- as --add-missing in other tools.
+ my $install = 0;
+@@ -643,6 +644,10 @@
+       }
+     }
+ 
++  @ex = grep (/^gnu-configize$/, @exclude);
++  if ($#ex == -1) {
++    xsystem ("$gnuconfigize");
++  }
+ 
+   # -------------- #
+   # Running make.  #
+Only in autoconf-2.60.orig/bin: autoreconf.in.orig
+Only in autoconf-2.60/bin: autoreconf.in.rej
diff --git a/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-include.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-include.patch
new file mode 100644
index 0000000..becb234
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/autoreconf-include.patch
@@ -0,0 +1,12 @@
+diff -ur autoconf-2.60.orig/bin/autoreconf.in autoconf-2.60/bin/autoreconf.in
+--- autoconf-2.60.orig/bin/autoreconf.in	2006-06-05 14:17:36.000000000 +0200
++++ autoconf-2.60/bin/autoreconf.in	2006-10-10 01:29:29.000000000 +0200
+@@ -187,6 +187,7 @@
+   $autoconf   .= join (' --prepend-include=', '', @prepend_include);
+   $autoheader .= join (' --include=', '', @include);
+   $autoheader .= join (' --prepend-include=', '', @prepend_include);
++  $aclocal    .= join (' -I ', '', @include);
+ 
+   # --install and --symlink;
+   if ($install)
+Only in autoconf-2.60/bin: autoreconf.in.orig
diff --git a/org.handhelds.familiar/packages/autoconf/autoconf-2.60/path_prog_fixes.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/path_prog_fixes.patch
new file mode 100644
index 0000000..5f0d055
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/path_prog_fixes.patch
@@ -0,0 +1,126 @@
+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 </dev/null 2>&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 <djm@gnu.ai.mit.edu>.
+ 
+-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 <djm@gnu.ai.mit.edu>.
+ # Rewritten by Akim Demaille <akim@freefriends.org>.
+ 
+-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/org.handhelds.familiar/packages/autoconf/autoconf-2.60/program_prefix.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/program_prefix.patch
new file mode 100644
index 0000000..3ddeae4
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/program_prefix.patch
@@ -0,0 +1,16 @@
+diff -ur autoconf-2.60.orig/lib/autoconf/general.m4 autoconf-2.60/lib/autoconf/general.m4
+--- autoconf-2.60.orig/lib/autoconf/general.m4	2006-06-16 23:05:41.000000000 +0200
++++ autoconf-2.60/lib/autoconf/general.m4	2006-10-10 01:28:08.000000000 +0200
+@@ -1755,8 +1755,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
+ 
+Only in autoconf-2.60/lib/autoconf: general.m4.orig
diff --git a/org.handhelds.familiar/packages/autoconf/autoconf-2.60/sizeof_types.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/sizeof_types.patch
new file mode 100644
index 0000000..4f8d7fb
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.60/sizeof_types.patch
@@ -0,0 +1,50 @@
+diff -ur autoconf-2.60.orig/lib/autoconf/types.m4 autoconf-2.60/lib/autoconf/types.m4
+--- autoconf-2.60.orig/lib/autoconf/types.m4	2006-06-22 20:13:40.000000000 +0200
++++ autoconf-2.60/lib/autoconf/types.m4	2006-10-10 01:43:03.000000000 +0200
+@@ -663,27 +663,34 @@
+ # Generic checks.  #
+ # ---------------- #
+ 
++AC_DEFUN([AC_PROG_SIZE],
++[
++  AC_CHECK_TOOL(SIZE, size, :)
++])
+ 
+ # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
+ # ---------------------------------------------------------------
+ AC_DEFUN([AC_CHECK_SIZEOF],
+-[AS_LITERAL_IF([$1], [],
++[AC_REQUIRE([AC_PROG_SIZE])
++AC_REQUIRE([AC_PROG_AWK])
++ AS_LITERAL_IF([$1], [],
+ 	       [AC_FATAL([$0: requires literal arguments])])dnl
+ AC_CHECK_TYPE([$1], [], [], [$3])
+ AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]),
+-[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+-  _AC_COMPUTE_INT([(long int) (sizeof (ac__type_sizeof_))],
+-		  [AS_TR_SH([ac_cv_sizeof_$1])],
+-		  [AC_INCLUDES_DEFAULT([$3])
+-		   typedef $1 ac__type_sizeof_;],
+-		  [AC_MSG_FAILURE([cannot compute sizeof ($1)], 77)])
++[
++if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
++		   [static const $1 x[[256]];])],
++		   [
++		     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
++		   ],
++		   [
++		     AS_TR_SH([ac_cv_sizeof_$1])=0
++		   ])
+ else
+   AS_TR_SH([ac_cv_sizeof_$1])=0
+-fi])dnl
++fi
++])dnl
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
+ 		   [The size of `$1', as computed by sizeof.])
+ ])# AC_CHECK_SIZEOF
diff --git a/org.handhelds.familiar/packages/autoconf/autoconf-native_2.60.bb b/org.handhelds.familiar/packages/autoconf/autoconf-native_2.60.bb
new file mode 100644
index 0000000..846a447
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-native_2.60.bb
@@ -0,0 +1,7 @@
+SECTION = "devel"
+include autoconf_${PV}.bb
+DEPENDS = "m4-native gnu-config-native"
+S = "${WORKDIR}/autoconf-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
+
+inherit native
diff --git a/org.handhelds.familiar/packages/autoconf/autoconf_2.60.bb b/org.handhelds.familiar/packages/autoconf/autoconf_2.60.bb
new file mode 100644
index 0000000..f274698
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf_2.60.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "A package of M4 macros to produce scripts to \
+automatically configure sourcecode."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/autoconf/"
+SECTION = "devel"
+DEPENDS += "m4-native"
+RDEPENDS_${PN} = "m4 gnu-config"
+RRECOMMENDS_${PN} = "automake"
+
+SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
+	   file://program_prefix.patch;patch=1 \
+	   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://sizeof_types.patch;patch=1 \
+	   ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+inherit autotools