autoconf: Fixed calling of perl and m4:

* removed path_prog_fixes.patch
* set needed ac_cv_* variables for non-native builds
* depend on perl
* for more see http://thread.gmane.org/gmane.comp.handhelds.openembedded/26476

diff --git a/recipes/autoconf/autoconf-2.59/path_prog_fixes.patch b/recipes/autoconf/autoconf-2.59/path_prog_fixes.patch
deleted file mode 100644 (file)
index 5f0d055..0000000
--- a/recipes/autoconf/autoconf-2.59/path_prog_fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-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/recipes/autoconf/autoconf-2.61/path_prog_fixes.patch b/recipes/autoconf/autoconf-2.61/path_prog_fixes.patch
deleted file mode 100644 (file)
index 5f0d055..0000000
--- a/recipes/autoconf/autoconf-2.61/path_prog_fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-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/recipes/autoconf/autoconf-2.63/path_prog_fixes.patch b/recipes/autoconf/autoconf-2.63/path_prog_fixes.patch
deleted file mode 100644 (file)
index 5f0d055..0000000
--- a/recipes/autoconf/autoconf-2.63/path_prog_fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-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/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index a05f2ae..5bdc7e1 100644 (file)
--- a/recipes/autoconf/autoconf.inc
+++ b/recipes/autoconf/autoconf.inc
@@ -4,10 +4,18 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/autoconf/"
 SECTION = "devel"
 DEPENDS += "m4-native"
-RDEPENDS_${PN} = "m4 gnu-config"
+RDEPENDS_${PN} = "m4 perl gnu-config"
+INC_PR = "r7"
 
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
           file://program_prefix.patch;patch=1"
 
 inherit autotools
-INC_PR = "r6"
+
+do_configure_prepend () {
+       if ${@['true', 'false'][bb.data.inherits_class('native', d)]}
+       then
+               export ac_cv_path_PERL="${ac_cv_path_PERL=${bindir}/perl}"
+               export ac_cv_path_M4="${ac_cv_path_M4=${bindir}/m4}"
+       fi
+}

diff --git a/recipes/autoconf/autoconf_2.59.bb b/recipes/autoconf/autoconf_2.59.bb
index a8f357f..e9149df 100644 (file)
--- a/recipes/autoconf/autoconf_2.59.bb
+++ b/recipes/autoconf/autoconf_2.59.bb
@@ -10,5 +10,4 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
           file://autoheader-nonfatal-warnings.patch;patch=1 \
           file://sizeof_types.patch;patch=1 \
           file://autoconf-x.patch;patch=1 \
-          file://autoconf-sh.patch;patch=1 \
-          ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+          file://autoconf-sh.patch;patch=1"

diff --git a/recipes/autoconf/autoconf_2.63.bb b/recipes/autoconf/autoconf_2.63.bb
index 6963baf..e26c004 100644 (file)
--- a/recipes/autoconf/autoconf_2.63.bb
+++ b/recipes/autoconf/autoconf_2.63.bb
@@ -6,10 +6,8 @@ DEFAULT_PREFERENCE = "-1"
 
 PARALLEL_MAKE = ""
 
-SRC_URI += " \
-          file://autoreconf-exclude.patch;patch=1 \
-          file://autoreconf-foreign.patch;patch=1 \
-          file://autoheader-nonfatal-warnings.patch;patch=1 \
-       file://autoreconf-gnuconfigize.patch;patch=1 \
-       file://config-site.patch;patch=1 \
-          ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+SRC_URI += "file://autoreconf-exclude.patch;patch=1 \
+           file://autoreconf-foreign.patch;patch=1 \
+           file://autoheader-nonfatal-warnings.patch;patch=1 \
+           file://autoreconf-gnuconfigize.patch;patch=1 \
+           file://config-site.patch;patch=1"