[oe-commits] org.oe.dreambox autoconf: add 2.61
tmbinc commit
oe at amethyst.openembedded.net
Thu Apr 17 11:58:43 UTC 2008
autoconf: add 2.61
Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: e5009f1f613c15b69537683fdf071cfd92893b67
ViewMTN: http://monotone.openembedded.org/revision/info/e5009f1f613c15b69537683fdf071cfd92893b67
Files:
1
packages/autoconf/autoconf-2.61
packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch
packages/autoconf/autoconf-2.61/autoreconf-exclude.patch
packages/autoconf/autoconf-2.61/autoreconf-foreign.patch
packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch
packages/autoconf/autoconf-2.61/autoreconf-include.patch
packages/autoconf/autoconf-2.61/config-site.patch
packages/autoconf/autoconf-2.61/fix_path_xtra.patch
packages/autoconf/autoconf-2.61/path_prog_fixes.patch
packages/autoconf/autoconf-2.61/program_prefix.patch
packages/autoconf/autoconf-native_2.61.bb
packages/autoconf/autoconf_2.61.bb
Diffs:
#
# mt diff -r7f2d48179079dad2fc5e188716b96a8cb19944ca -re5009f1f613c15b69537683fdf071cfd92893b67
#
#
#
# add_dir "packages/autoconf/autoconf-2.61"
#
# add_file "packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch"
# content [ade85eff83a38ba1d4eebe448f9bf44f1fb2f922]
#
# add_file "packages/autoconf/autoconf-2.61/autoreconf-exclude.patch"
# content [e70b15a2db2368baac04bb52ef48889f6738b243]
#
# add_file "packages/autoconf/autoconf-2.61/autoreconf-foreign.patch"
# content [c98f459d4b09a19be8249ed66fc625acd0d39b3f]
#
# add_file "packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch"
# content [b3a6e2dd0493368acdbbe330ab3c59965b5e5a04]
#
# add_file "packages/autoconf/autoconf-2.61/autoreconf-include.patch"
# content [4e89ddaa54cf91e103b7de012fe1950761123148]
#
# add_file "packages/autoconf/autoconf-2.61/config-site.patch"
# content [b83a5c63b39c809371af530d1b25b207e7c27dbe]
#
# add_file "packages/autoconf/autoconf-2.61/fix_path_xtra.patch"
# content [b750b33038108521042cd0c4435cba62a2f2aa11]
#
# add_file "packages/autoconf/autoconf-2.61/path_prog_fixes.patch"
# content [91f1c40bf85bf404758afbae4d88d17871a0fabc]
#
# add_file "packages/autoconf/autoconf-2.61/program_prefix.patch"
# content [36937818d0ee0db5bd4f720d7717ae26a5865e16]
#
# add_file "packages/autoconf/autoconf-native_2.61.bb"
# content [df4d485d3054c9db240bbff4da81782adb601ec7]
#
# add_file "packages/autoconf/autoconf_2.61.bb"
# content [aed7c593f2821ef10dbb8a908121c9b94d0024a6]
#
============================================================
--- packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch ade85eff83a38ba1d4eebe448f9bf44f1fb2f922
+++ packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch ade85eff83a38ba1d4eebe448f9bf44f1fb2f922
@@ -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");
============================================================
--- packages/autoconf/autoconf-2.61/autoreconf-exclude.patch e70b15a2db2368baac04bb52ef48889f6738b243
+++ packages/autoconf/autoconf-2.61/autoreconf-exclude.patch e70b15a2db2368baac04bb52ef48889f6738b243
@@ -0,0 +1,127 @@
+Index: autoconf-2.61/bin/autoreconf.in
+===================================================================
+--- autoconf-2.61.orig/bin/autoreconf.in 2006-12-14 20:25:59.000000000 +0100
++++ autoconf-2.61/bin/autoreconf.in 2006-12-14 20:33:11.000000000 +0100
+@@ -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]
+
+@@ -134,6 +135,13 @@
+ # Recurse into subpackages
+ my $recursive = 1;
+
++# Steps to exclude
++my @exclude;
++my @ex;
++
++my $uses_gettext;
++my $configure_ac;
++
+ ## ---------- ##
+ ## Routines. ##
+ ## ---------- ##
+@@ -151,6 +159,7 @@
+ 'B|prepend-include=s' => \@prepend_include,
+ 'i|install' => \$install,
+ 's|symlink' => \$symlink,
++ 'x|exclude=s' => \@exclude,
+ 'm|make' => \$make,
+ 'recursive!' => \$recursive);
+
+@@ -160,6 +169,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
+@@ -253,6 +264,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)
+@@ -366,7 +382,10 @@
+ }
+ else
+ {
+- xsystem "$autopoint";
++ @ex = grep (/^autopoint$/, @exclude);
++ if ($#ex == -1) {
++ xsystem ("$autopoint");
++ }
+ }
+
+
+@@ -530,7 +549,10 @@
+ {
+ $libtoolize .= " --ltdl";
+ }
+- xsystem ($libtoolize);
++ @ex = grep (/^libtoolize$/, @exclude);
++ if ($#ex == -1) {
++ xsystem ("$libtoolize");
++ }
+ $rerun_aclocal = 1;
+ }
+ else
+@@ -570,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");
++ }
+
+
+ # -------------------- #
+@@ -591,7 +616,10 @@
+ }
+ else
+ {
+- xsystem ($autoheader);
++ @ex = grep (/^autoheader$/, @exclude);
++ if ($#ex == -1) {
++ xsystem ("$autoheader");
++ }
+ }
+
+
+@@ -608,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");
++ }
+ }
+
+
+@@ -632,7 +663,10 @@
+ }
+ else
+ {
+- xsystem ("make");
++ @ex = grep (/^make$/, @exclude);
++ if ($#ex == -1) {
++ xsystem ("make");
++ }
+ }
+ }
+ }
============================================================
--- packages/autoconf/autoconf-2.61/autoreconf-foreign.patch c98f459d4b09a19be8249ed66fc625acd0d39b3f
+++ packages/autoconf/autoconf-2.61/autoreconf-foreign.patch c98f459d4b09a19be8249ed66fc625acd0d39b3f
@@ -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);
============================================================
--- packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch b3a6e2dd0493368acdbbe330ab3c59965b5e5a04
+++ packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch b3a6e2dd0493368acdbbe330ab3c59965b5e5a04
@@ -0,0 +1,49 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+Index: autoconf-2.61/bin/autoreconf.in
+===================================================================
+--- autoconf-2.61.orig/bin/autoreconf.in 2006-12-14 20:33:52.000000000 +0100
++++ autoconf-2.61/bin/autoreconf.in 2006-12-14 20:34:28.000000000 +0100
+@@ -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 `.').
+
+@@ -107,12 +107,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;
+@@ -644,6 +645,10 @@
+ }
+ }
+
++ @ex = grep (/^gnu-configize$/, @exclude);
++ if ($#ex == -1) {
++ xsystem ("$gnuconfigize");
++ }
+
+ # -------------- #
+ # Running make. #
============================================================
--- packages/autoconf/autoconf-2.61/autoreconf-include.patch 4e89ddaa54cf91e103b7de012fe1950761123148
+++ packages/autoconf/autoconf-2.61/autoreconf-include.patch 4e89ddaa54cf91e103b7de012fe1950761123148
@@ -0,0 +1,10 @@
+--- autoconf/bin/autoreconf.in~ 2004-04-06 23:36:10.000000000 +0100
++++ autoconf/bin/autoreconf.in 2004-04-08 20:51:57.000000000 +0100
+@@ -179,6 +179,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)
============================================================
--- packages/autoconf/autoconf-2.61/config-site.patch b83a5c63b39c809371af530d1b25b207e7c27dbe
+++ packages/autoconf/autoconf-2.61/config-site.patch b83a5c63b39c809371af530d1b25b207e7c27dbe
@@ -0,0 +1,13 @@
+Index: autoconf-2.61/lib/autoconf/general.m4
+===================================================================
+--- autoconf-2.61.orig/lib/autoconf/general.m4 2007-07-10 15:09:01.000000000 +0100
++++ autoconf-2.61/lib/autoconf/general.m4 2007-07-10 15:09:17.000000000 +0100
+@@ -1767,7 +1767,7 @@
+ m4_define([AC_SITE_LOAD],
+ [# Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
+- set x "$CONFIG_SITE"
++ set x $CONFIG_SITE
+ elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ else
============================================================
--- packages/autoconf/autoconf-2.61/fix_path_xtra.patch b750b33038108521042cd0c4435cba62a2f2aa11
+++ packages/autoconf/autoconf-2.61/fix_path_xtra.patch b750b33038108521042cd0c4435cba62a2f2aa11
@@ -0,0 +1,114 @@
+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.61/lib/autoconf/libs.m4
+===================================================================
+--- autoconf-2.61.orig/lib/autoconf/libs.m4 2006-10-15 01:12:02.000000000 +0000
++++ autoconf-2.61/lib/autoconf/libs.m4 2007-11-15 12:09:59.000000000 +0000
+@@ -180,53 +180,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; 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 | /lib) ;;
+- *) 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.
+@@ -234,40 +187,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/X11R6/include
+-/usr/X11R5/include
+-/usr/X11R4/include
+-
+-/usr/include/X11
+-/usr/include/X11R6
+-/usr/include/X11R5
+-/usr/include/X11R4
+-
+-/usr/local/X11/include
+-/usr/local/X11R6/include
+-/usr/local/X11R5/include
+-/usr/local/X11R4/include
+-
+-/usr/local/include/X11
+-/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.
+@@ -316,7 +236,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 | *\'*)
============================================================
--- packages/autoconf/autoconf-2.61/path_prog_fixes.patch 91f1c40bf85bf404758afbae4d88d17871a0fabc
+++ packages/autoconf/autoconf-2.61/path_prog_fixes.patch 91f1c40bf85bf404758afbae4d88d17871a0fabc
@@ -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;
+
+%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list