summaryrefslogtreecommitdiffstats
path: root/meta/packages/autoconf
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-01 12:47:29 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-01 12:47:29 +0000
commit769baa11436400d570b66ec7d0b0adf149ad10f5 (patch)
tree991bb00759e5a8db98bffb87fc9d33c576887912 /meta/packages/autoconf
parent09ab7da4f9bf3cbd15cf6067a471d7752e3be105 (diff)
downloadpoky-769baa11436400d570b66ec7d0b0adf149ad10f5.tar.gz
autoconf-2.65: Ensure autoconf sees our site cache
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/autoconf')
-rw-r--r--meta/packages/autoconf/autoconf-2.65/config_site.patch29
-rw-r--r--meta/packages/autoconf/autoconf_2.65.bb5
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 @@
1Poky provides a list of site files in CONFIG_SITE whereas autoconf
2only expects one file. This patch changes autoconf to accept a list of
3them.
4
5RP 1/2/10
6
7Index: 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 @@
1require autoconf.inc 1require autoconf.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5PARALLEL_MAKE = "" 5PARALLEL_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
17DEFAULT_PREFERENCE = "-1" 18DEFAULT_PREFERENCE = "-1"
18 19