summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-05-24 09:38:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-06 15:58:39 +0100
commitd0c2307bca5e98c7ff7bbef9867cebce7b8aeafa (patch)
tree08e62d30eca23d0bde1da736aa5ee4760fa3235b /meta
parent5d359880f000700a7305d1b4548707652df6388e (diff)
downloadpoky-d0c2307bca5e98c7ff7bbef9867cebce7b8aeafa.tar.gz
autoconf: upgrade from 2.65 to 2.68
And rebase the patches to the newer code. (From OE-Core rev: aa24c1eda4b33b329d330c8bbb6d243dfd924f62) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch)0
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch)0
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch)0
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch)0
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch)0
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch)0
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/config_site.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch)19
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch)14
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch)0
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/program_prefix.patch (renamed from meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch)0
-rw-r--r--meta/recipes-devtools/autoconf/autoconf_2.68.bb (renamed from meta/recipes-devtools/autoconf/autoconf_2.65.bb)6
11 files changed, 24 insertions, 15 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch b/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch
index 6ebef0a540..6ebef0a540 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch b/meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch
index 8ae6d5c8aa..8ae6d5c8aa 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
index d1bd3a2a31..d1bd3a2a31 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch
index 88f750195d..88f750195d 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
index 5ff18c2350..5ff18c2350 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
index 31326f0bc8..31326f0bc8 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch b/meta/recipes-devtools/autoconf/autoconf/config_site.patch
index e3ff318bbe..9f044404dd 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/config_site.patch
@@ -6,17 +6,26 @@ them.
6 6
7RP 1/2/10 7RP 1/2/10
8 8
9Index: autoconf-2.65/lib/autoconf/general.m4 9Updated for 2.68 version: the CONFIG_SITE var was not getting used at all
10fixed the 2.68 code
11Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/27
12
13Index: autoconf-2.68/lib/autoconf/general.m4
10=================================================================== 14===================================================================
11--- autoconf-2.65.orig/lib/autoconf/general.m4 2010-02-01 12:41:32.329073138 +0000 15--- autoconf-2.68.orig/lib/autoconf/general.m4
12+++ autoconf-2.65/lib/autoconf/general.m4 2010-02-01 12:41:56.769040799 +0000 16+++ autoconf-2.68/lib/autoconf/general.m4
13@@ -1863,17 +1863,10 @@ 17@@ -1878,7 +1878,6 @@ AU_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPL
14 m4_define([AC_SITE_LOAD], 18 m4_define([AC_SITE_LOAD],
15 [# Prefer an explicitly selected file to automatically selected ones. 19 [# Prefer an explicitly selected file to automatically selected ones.
16 ac_site_file1=NONE 20 ac_site_file1=NONE
17-ac_site_file2=NONE 21-ac_site_file2=NONE
18 if test -n "$CONFIG_SITE"; then 22 if test -n "$CONFIG_SITE"; then
19 ac_site_file1=$CONFIG_SITE 23 # We do not want a PATH search for config.site.
24 case $CONFIG_SITE in @%:@((
25@@ -1886,14 +1885,8 @@ if test -n "$CONFIG_SITE"; then
26 */*) ac_site_file1=$CONFIG_SITE;;
27 *) ac_site_file1=./$CONFIG_SITE;;
28 esac
20-elif test "x$prefix" != xNONE; then 29-elif test "x$prefix" != xNONE; then
21- ac_site_file1=$prefix/share/config.site 30- ac_site_file1=$prefix/share/config.site
22- ac_site_file2=$prefix/etc/config.site 31- ac_site_file2=$prefix/etc/config.site
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch b/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
index 29fe6a27bb..65df88f8f9 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
@@ -6,11 +6,11 @@ This patch removes them to stop any confusion.
6 6
7RP - 20071115 7RP - 20071115
8 8
9Index: autoconf-2.65/lib/autoconf/libs.m4 9Index: autoconf-2.68/lib/autoconf/libs.m4
10=================================================================== 10===================================================================
11--- autoconf-2.65.orig/lib/autoconf/libs.m4 2009-10-29 01:53:41.000000000 +0000 11--- autoconf-2.68.orig/lib/autoconf/libs.m4
12+++ autoconf-2.65/lib/autoconf/libs.m4 2010-01-29 13:40:13.000000000 +0000 12+++ autoconf-2.68/lib/autoconf/libs.m4
13@@ -159,53 +159,6 @@ 13@@ -159,53 +159,6 @@ m4_popdef([AC_Lib_Name])dnl
14 # --------------------- # 14 # --------------------- #
15 15
16 16
@@ -32,7 +32,7 @@ Index: autoconf-2.65/lib/autoconf/libs.m4
32- @echo libdir='${LIBDIR}' 32- @echo libdir='${LIBDIR}'
33-_ACEOF 33-_ACEOF
34- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then 34- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
35- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 35- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
36- for ac_var in incroot usrlibdir libdir; do 36- for ac_var in incroot usrlibdir libdir; do
37- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" 37- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
38- done 38- done
@@ -64,7 +64,7 @@ Index: autoconf-2.65/lib/autoconf/libs.m4
64 # _AC_PATH_X_DIRECT 64 # _AC_PATH_X_DIRECT
65 # ----------------- 65 # -----------------
66 # Internal subroutine of _AC_PATH_X. 66 # Internal subroutine of _AC_PATH_X.
67@@ -213,44 +166,7 @@ 67@@ -213,44 +166,7 @@ fi
68 m4_define([_AC_PATH_X_DIRECT], 68 m4_define([_AC_PATH_X_DIRECT],
69 [# Standard set of common directories for X headers. 69 [# Standard set of common directories for X headers.
70 # Check X11 before X11Rn because it is often a symlink to the current release. 70 # Check X11 before X11Rn because it is often a symlink to the current release.
@@ -110,7 +110,7 @@ Index: autoconf-2.65/lib/autoconf/libs.m4
110 110
111 if test "$ac_x_includes" = no; then 111 if test "$ac_x_includes" = no; then
112 # Guess where to find include files, by looking for Xlib.h. 112 # Guess where to find include files, by looking for Xlib.h.
113@@ -299,7 +215,6 @@ 113@@ -299,7 +215,6 @@ AC_DEFUN([_AC_PATH_X],
114 [AC_CACHE_VAL(ac_cv_have_x, 114 [AC_CACHE_VAL(ac_cv_have_x,
115 [# One or both of the vars are not set, and there is no cached value. 115 [# One or both of the vars are not set, and there is no cached value.
116 ac_x_includes=no ac_x_libraries=no 116 ac_x_includes=no ac_x_libraries=no
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch b/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch
index cb57dfdfe7..cb57dfdfe7 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch b/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
index 978a401f0a..978a401f0a 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.65.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
index 0bc615e58c..c647a15111 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.65.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
@@ -1,6 +1,6 @@
1require autoconf.inc 1require autoconf.inc
2 2
3PR = "r2" 3PR = "r0"
4 4
5PARALLEL_MAKE = "" 5PARALLEL_MAKE = ""
6 6
@@ -17,8 +17,8 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
17 ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \ 17 ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \
18 file://config_site.patch;patch=1" 18 file://config_site.patch;patch=1"
19 19
20SRC_URI[md5sum] = "a6de1cc6434cd64038b0a0ae4e252b33" 20SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07"
21SRC_URI[sha256sum] = "db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b" 21SRC_URI[sha256sum] = "c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8"
22 22
23DEPENDS_virtclass-native = "m4-native gnu-config-native" 23DEPENDS_virtclass-native = "m4-native gnu-config-native"
24RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" 24RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"