diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/autoconf/autoconf-2.65/config_site.patch | 29 | ||||
-rw-r--r-- | meta/packages/autoconf/autoconf_2.65.bb | 5 |
2 files changed, 32 insertions, 2 deletions
diff --git a/meta/packages/autoconf/autoconf-2.65/config_site.patch b/meta/packages/autoconf/autoconf-2.65/config_site.patch new file mode 100644 index 0000000000..8a90cd3307 --- /dev/null +++ b/meta/packages/autoconf/autoconf-2.65/config_site.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Poky provides a list of site files in CONFIG_SITE whereas autoconf | ||
2 | only expects one file. This patch changes autoconf to accept a list of | ||
3 | them. | ||
4 | |||
5 | RP 1/2/10 | ||
6 | |||
7 | Index: autoconf-2.65/lib/autoconf/general.m4 | ||
8 | =================================================================== | ||
9 | --- autoconf-2.65.orig/lib/autoconf/general.m4 2010-02-01 12:41:32.329073138 +0000 | ||
10 | +++ autoconf-2.65/lib/autoconf/general.m4 2010-02-01 12:41:56.769040799 +0000 | ||
11 | @@ -1863,17 +1863,10 @@ | ||
12 | m4_define([AC_SITE_LOAD], | ||
13 | [# Prefer an explicitly selected file to automatically selected ones. | ||
14 | ac_site_file1=NONE | ||
15 | -ac_site_file2=NONE | ||
16 | if test -n "$CONFIG_SITE"; then | ||
17 | ac_site_file1=$CONFIG_SITE | ||
18 | -elif test "x$prefix" != xNONE; then | ||
19 | - ac_site_file1=$prefix/share/config.site | ||
20 | - ac_site_file2=$prefix/etc/config.site | ||
21 | -else | ||
22 | - ac_site_file1=$ac_default_prefix/share/config.site | ||
23 | - ac_site_file2=$ac_default_prefix/etc/config.site | ||
24 | fi | ||
25 | -for ac_site_file in "$ac_site_file1" "$ac_site_file2" | ||
26 | +for ac_site_file in $ac_site_file1 | ||
27 | do | ||
28 | test "x$ac_site_file" = xNONE && continue | ||
29 | if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then | ||
diff --git a/meta/packages/autoconf/autoconf_2.65.bb b/meta/packages/autoconf/autoconf_2.65.bb index b7258fa25c..d3b2c37ae8 100644 --- a/meta/packages/autoconf/autoconf_2.65.bb +++ b/meta/packages/autoconf/autoconf_2.65.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require autoconf.inc | 1 | require autoconf.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | PARALLEL_MAKE = "" | 5 | PARALLEL_MAKE = "" |
6 | 6 | ||
@@ -12,7 +12,8 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \ | |||
12 | file://autoreconf-foreign.patch;patch=1 \ | 12 | file://autoreconf-foreign.patch;patch=1 \ |
13 | file://autoreconf-gnuconfigize.patch;patch=1 \ | 13 | file://autoreconf-gnuconfigize.patch;patch=1 \ |
14 | file://autoheader-nonfatal-warnings.patch;patch=1 \ | 14 | file://autoheader-nonfatal-warnings.patch;patch=1 \ |
15 | ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" | 15 | ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \ |
16 | file://config_site.patch;patch=1" | ||
16 | 17 | ||
17 | DEFAULT_PREFERENCE = "-1" | 18 | DEFAULT_PREFERENCE = "-1" |
18 | 19 | ||