summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-08-27 22:27:53 +0000
committerRichard Purdie <richard@openedhand.com>2006-08-27 22:27:53 +0000
commit566a46390b5b708d8c661ea51b064921555ad5f8 (patch)
treeea2db46fc8987b20cdea03ea96a77eba7672ef68
parent57a3f74e90db56eac157776843196d134525cc4c (diff)
downloadpoky-566a46390b5b708d8c661ea51b064921555ad5f8.tar.gz
autoconf: Sync with OE (include -> requires and add AC_CHECK_TARGET_TOOL backport from 2.60)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@660 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/autoconf/autoconf-2.59/sizeof_types.patch64
-rw-r--r--meta/packages/autoconf/autoconf-native_2.59.bb2
-rw-r--r--meta/packages/autoconf/autoconf_2.59.bb2
3 files changed, 48 insertions, 20 deletions
diff --git a/meta/packages/autoconf/autoconf-2.59/sizeof_types.patch b/meta/packages/autoconf/autoconf-2.59/sizeof_types.patch
index 9a6e47453e..30fd5c1926 100644
--- a/meta/packages/autoconf/autoconf-2.59/sizeof_types.patch
+++ b/meta/packages/autoconf/autoconf-2.59/sizeof_types.patch
@@ -3,15 +3,38 @@
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher 3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4# 4#
5 5
6--- autoconf-2.59/lib/autoconf/types.m4~sizeof_types.patch 2003-05-22 08:05:14.000000000 -0400 6Index: autoconf-2.59/lib/autoconf/types.m4
7+++ autoconf-2.59/lib/autoconf/types.m4 2004-05-29 01:31:24.828295015 -0400 7===================================================================
8@@ -380,32 +380,38 @@ 8--- autoconf-2.59.orig/lib/autoconf/types.m4 2003-05-22 14:05:14.000000000 +0200
9+++ autoconf-2.59/lib/autoconf/types.m4 2006-08-06 02:05:02.000000000 +0200
10@@ -380,26 +380,66 @@
9 # Generic checks. # 11 # Generic checks. #
10 # ---------------- # 12 # ---------------- #
11 13
14+# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
15+# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
16+# ------------------------------------------------------------------------
17+# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
18+AC_DEFUN([AC_CHECK_TARGET_TOOL],
19+[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
20+AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
21+if test -z "$ac_cv_prog_$1"; then
22+ if test "$build" = "$target"; then
23+ ac_ct_$1=$$1
24+ AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
25+ $1=ac_ct_$1
26+ else
27+ $1="$3"
28+ fi
29+else
30+ $1="$ac_cv_prog_$1"
31+fi
32+])# AC_CHECK_TARGET_TOOL
33+
34+
12+AC_DEFUN([AC_PROG_SIZE], 35+AC_DEFUN([AC_PROG_SIZE],
13+[ 36+[
14+ AC_CHECK_TOOL(SIZE, size, :) 37+ AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
15+]) 38+])
16 39
17 # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES]) 40 # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
@@ -35,14 +58,25 @@
35- [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) 58- [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
36+[ 59+[
37+if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then 60+if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
38+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])], 61+ if test "$cross_compiling" = yes; then
39+ [static const $1 x[[256]];])], 62+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
40+ [ 63+ [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
41+ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'` 64+ [
42+ ], 65+ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
43+ [ 66+ ],
44+ AS_TR_SH([ac_cv_sizeof_$1])=0 67+ [
45+ ]) 68+ AS_TR_SH([ac_cv_sizeof_$1])=0
69+ ])
70+ else
71+ # The cast to unsigned long works around a bug in the HP C Compiler
72+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
73+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
74+ # This bug is HP SR number 8606223364.
75+ _AC_COMPUTE_INT([(long) (sizeof ($1))],
76+ [AS_TR_SH([ac_cv_sizeof_$1])],
77+ [AC_INCLUDES_DEFAULT([$3])],
78+ [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
79+ fi
46 else 80 else
47 AS_TR_SH([ac_cv_sizeof_$1])=0 81 AS_TR_SH([ac_cv_sizeof_$1])=0
48-fi])dnl 82-fi])dnl
@@ -51,9 +85,3 @@
51 AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]), 85 AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
52 [The size of a `$1', as computed by sizeof.]) 86 [The size of a `$1', as computed by sizeof.])
53 ])# AC_CHECK_SIZEOF 87 ])# AC_CHECK_SIZEOF
54
55-
56-
57 # ---------------- #
58 # Generic checks. #
59 # ---------------- #
diff --git a/meta/packages/autoconf/autoconf-native_2.59.bb b/meta/packages/autoconf/autoconf-native_2.59.bb
index 17f27bae4c..92a9257797 100644
--- a/meta/packages/autoconf/autoconf-native_2.59.bb
+++ b/meta/packages/autoconf/autoconf-native_2.59.bb
@@ -1,5 +1,5 @@
1SECTION = "devel" 1SECTION = "devel"
2include autoconf_${PV}.bb 2require autoconf_${PV}.bb
3DEPENDS = "m4-native gnu-config-native" 3DEPENDS = "m4-native gnu-config-native"
4RDEPENDS_${PN} = "m4-native gnu-config-native" 4RDEPENDS_${PN} = "m4-native gnu-config-native"
5 5
diff --git a/meta/packages/autoconf/autoconf_2.59.bb b/meta/packages/autoconf/autoconf_2.59.bb
index c9cdc624a1..3a5c220a48 100644
--- a/meta/packages/autoconf/autoconf_2.59.bb
+++ b/meta/packages/autoconf/autoconf_2.59.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/"
5SECTION = "devel" 5SECTION = "devel"
6DEPENDS += "m4-native" 6DEPENDS += "m4-native"
7RDEPENDS_${PN} = "m4 gnu-config" 7RDEPENDS_${PN} = "m4 gnu-config"
8PR = "r4" 8PR = "r5"
9 9
10SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ 10SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
11 file://program_prefix.patch;patch=1 \ 11 file://program_prefix.patch;patch=1 \