diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2013-12-26 23:14:18 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 11:13:59 +0000 |
| commit | 484727e25f312a4df02047515c4ff729e3287aff (patch) | |
| tree | c615537ddbc961e8928e87ee32265739021e5366 | |
| parent | 9c1d1ddf5e2c3a8beed1a2937dea0f2b9edd5c71 (diff) | |
| download | poky-484727e25f312a4df02047515c4ff729e3287aff.tar.gz | |
autoconf: remove path_prog_fixes.patch
The path_prog_fixes.patch was used for fixing the perl path, but the
do_install_append() can do it, so remove this patch.
(From OE-Core rev: 117861aba856bb7ad67c3e7f3635556589474369)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch | 128 | ||||
| -rw-r--r-- | meta/recipes-devtools/autoconf/autoconf_2.69.bb | 1 |
2 files changed, 0 insertions, 129 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch b/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch deleted file mode 100644 index cb57dfdfe7..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch +++ /dev/null | |||
| @@ -1,128 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Index: autoconf-2.59/bin/autoheader.in | ||
| 4 | =================================================================== | ||
| 5 | --- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500 | ||
| 6 | +++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500 | ||
| 7 | @@ -1,8 +1,8 @@ | ||
| 8 | -#! @PERL@ | ||
| 9 | +#! @bindir@/env perl | ||
| 10 | # -*- Perl -*- | ||
| 11 | # @configure_input@ | ||
| 12 | |||
| 13 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 14 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' | ||
| 15 | if 0; | ||
| 16 | |||
| 17 | # autoheader -- create `config.h.in' from `configure.ac' | ||
| 18 | Index: autoconf-2.59/bin/autom4te.in | ||
| 19 | =================================================================== | ||
| 20 | --- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500 | ||
| 21 | +++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500 | ||
| 22 | @@ -1,8 +1,10 @@ | ||
| 23 | -#! @PERL@ -w | ||
| 24 | +#! @bindir@/env perl | ||
| 25 | # -*- perl -*- | ||
| 26 | # @configure_input@ | ||
| 27 | |||
| 28 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 29 | +use warnings; | ||
| 30 | + | ||
| 31 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 32 | if 0; | ||
| 33 | |||
| 34 | # autom4te - Wrapper around M4 libraries. | ||
| 35 | @@ -87,7 +89,7 @@ | ||
| 36 | my $freeze = 0; | ||
| 37 | |||
| 38 | # $M4. | ||
| 39 | -my $m4 = $ENV{"M4"} || '@M4@'; | ||
| 40 | +my $m4 = $ENV{"M4"} || '@bindir@/env m4'; | ||
| 41 | # Some non-GNU m4's don't reject the --help option, so give them /dev/null. | ||
| 42 | fatal "need GNU m4 1.4 or later: $m4" | ||
| 43 | if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null"; | ||
| 44 | Index: autoconf-2.59/bin/autoreconf.in | ||
| 45 | =================================================================== | ||
| 46 | --- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500 | ||
| 47 | +++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500 | ||
| 48 | @@ -1,8 +1,10 @@ | ||
| 49 | -#! @PERL@ -w | ||
| 50 | +#! @bindir@/env perl | ||
| 51 | # -*- perl -*- | ||
| 52 | # @configure_input@ | ||
| 53 | |||
| 54 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 55 | +use warnings; | ||
| 56 | + | ||
| 57 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 58 | if 0; | ||
| 59 | |||
| 60 | # autoreconf - install the GNU Build System in a directory tree | ||
| 61 | Index: autoconf-2.59/bin/autoscan.in | ||
| 62 | =================================================================== | ||
| 63 | --- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400 | ||
| 64 | +++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500 | ||
| 65 | @@ -1,4 +1,4 @@ | ||
| 66 | -#! @PERL@ -w | ||
| 67 | +#! @bindir@/env perl | ||
| 68 | # -*- perl -*- | ||
| 69 | # autoscan - Create configure.scan (a preliminary configure.ac) for a package. | ||
| 70 | # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 | ||
| 71 | @@ -21,7 +21,9 @@ | ||
| 72 | |||
| 73 | # Written by David MacKenzie <djm@gnu.ai.mit.edu>. | ||
| 74 | |||
| 75 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 76 | +use warnings; | ||
| 77 | + | ||
| 78 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 79 | if 0; | ||
| 80 | |||
| 81 | BEGIN | ||
| 82 | Index: autoconf-2.59/bin/autoupdate.in | ||
| 83 | =================================================================== | ||
| 84 | --- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400 | ||
| 85 | +++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500 | ||
| 86 | @@ -1,4 +1,4 @@ | ||
| 87 | -#! @PERL@ -w | ||
| 88 | +#! @bindir@/env perl | ||
| 89 | # -*- perl -*- | ||
| 90 | # autoupdate - modernize an Autoconf file. | ||
| 91 | # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 | ||
| 92 | @@ -22,7 +22,9 @@ | ||
| 93 | # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>. | ||
| 94 | # Rewritten by Akim Demaille <akim@freefriends.org>. | ||
| 95 | |||
| 96 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 97 | +use warnings; | ||
| 98 | + | ||
| 99 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 100 | if 0; | ||
| 101 | |||
| 102 | BEGIN | ||
| 103 | @@ -54,7 +56,7 @@ | ||
| 104 | my @include = ('@datadir@'); | ||
| 105 | my $force = 0; | ||
| 106 | # m4. | ||
| 107 | -my $m4 = $ENV{"M4"} || '@M4@'; | ||
| 108 | +my $m4 = $ENV{"M4"} || '@bindir@/env m4'; | ||
| 109 | |||
| 110 | |||
| 111 | # $HELP | ||
| 112 | Index: autoconf-2.59/bin/ifnames.in | ||
| 113 | =================================================================== | ||
| 114 | --- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400 | ||
| 115 | +++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500 | ||
| 116 | @@ -1,8 +1,10 @@ | ||
| 117 | -#! @PERL@ -w | ||
| 118 | +#! @bindir@/env perl | ||
| 119 | # -*- perl -*- | ||
| 120 | # @configure_input@ | ||
| 121 | |||
| 122 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 123 | +use warnings; | ||
| 124 | + | ||
| 125 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 126 | if 0; | ||
| 127 | |||
| 128 | # ifnames - print the identifiers used in C preprocessor conditionals | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb index 15227299d4..b67155bc99 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb | |||
| @@ -13,7 +13,6 @@ SRC_URI += "file://autoreconf-include.patch \ | |||
| 13 | file://autoreconf-foreign.patch \ | 13 | file://autoreconf-foreign.patch \ |
| 14 | file://autoreconf-gnuconfigize.patch \ | 14 | file://autoreconf-gnuconfigize.patch \ |
| 15 | file://autoheader-nonfatal-warnings.patch \ | 15 | file://autoheader-nonfatal-warnings.patch \ |
| 16 | ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d)]} \ | ||
| 17 | file://config_site.patch \ | 16 | file://config_site.patch \ |
| 18 | file://remove-usr-local-lib-from-m4.patch \ | 17 | file://remove-usr-local-lib-from-m4.patch \ |
| 19 | file://preferbash.patch \ | 18 | file://preferbash.patch \ |
