summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-06-20 13:58:15 (GMT)
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-06-20 13:58:15 (GMT)
commitf3b60f7bda68c397406374adadeec4032d27bc76 (patch)
tree45683c9d4b3daeda5518edacec0220ebff85180e
parentfcbca8870cbeb3a49cebcd3e596408070e6a1cd4 (diff)
downloadpoky-f3b60f7bda68c397406374adadeec4032d27bc76.tar.gz
gmp: update to 4.2.2 - this will unbreak Pinky on distibutions with gcc 4.3 (from trunk)
git-svn-id: https://svn.o-hand.com/repos/poky/branches/pinky@4716 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/gmp/gmp-4.2.2/amd64.patch (renamed from meta/packages/gmp/gmp-4.2.1/amd64.patch)0
-rw-r--r--meta/packages/gmp/gmp-4.2.2/configure.patch (renamed from meta/packages/gmp/gmp-4.2.1/configure.patch)50
-rw-r--r--meta/packages/gmp/gmp-4.2.2/sh4-asmfix.patch (renamed from meta/packages/gmp/gmp-4.2.1/sh4-asmfix.patch)0
-rw-r--r--meta/packages/gmp/gmp-native_4.2.2.bb (renamed from meta/packages/gmp/gmp-native_4.2.1.bb)2
-rw-r--r--meta/packages/gmp/gmp.inc2
-rw-r--r--meta/packages/gmp/gmp_4.2.2.bb (renamed from meta/packages/gmp/gmp_4.2.1.bb)0
6 files changed, 28 insertions, 26 deletions
diff --git a/meta/packages/gmp/gmp-4.2.1/amd64.patch b/meta/packages/gmp/gmp-4.2.2/amd64.patch
index 67be9dd..67be9dd 100644
--- a/meta/packages/gmp/gmp-4.2.1/amd64.patch
+++ b/meta/packages/gmp/gmp-4.2.2/amd64.patch
diff --git a/meta/packages/gmp/gmp-4.2.1/configure.patch b/meta/packages/gmp/gmp-4.2.2/configure.patch
index 08f2172..b563bd0 100644
--- a/meta/packages/gmp/gmp-4.2.1/configure.patch
+++ b/meta/packages/gmp/gmp-4.2.2/configure.patch
@@ -2,11 +2,11 @@
2 configure.in | 24 +++++++++--------------- 2 configure.in | 24 +++++++++---------------
3 2 files changed, 23 insertions(+), 27 deletions(-) 3 2 files changed, 23 insertions(+), 27 deletions(-)
4 4
5Index: gmp-4.2.1/acinclude.m4 5Index: gmp-4.2.2/acinclude.m4
6=================================================================== 6===================================================================
7--- gmp-4.2.1.orig/acinclude.m4 2006-05-04 17:39:01.000000000 +0100 7--- gmp-4.2.2.orig/acinclude.m4 2007-09-01 11:09:03.000000000 +0100
8+++ gmp-4.2.1/acinclude.m4 2006-11-06 20:36:14.000000000 +0000 8+++ gmp-4.2.2/acinclude.m4 2008-04-30 17:19:16.000000000 +0100
9@@ -32,20 +32,20 @@ dnl a_out.exe - OpenVMS DEC C called 9@@ -30,20 +30,20 @@
10 dnl conftest.exe - various DOS compilers 10 dnl conftest.exe - various DOS compilers
11 11
12 12
@@ -31,7 +31,7 @@ Index: gmp-4.2.1/acinclude.m4
31 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-*]]) 31 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-*]])
32 32
33 33
34@@ -64,7 +64,7 @@ dnl x86 -> x86 34@@ -62,7 +62,7 @@
35 dnl x86/k6 -> k6 35 dnl x86/k6 -> k6
36 dnl x86/k6/mmx -> k6_mmx 36 dnl x86/k6/mmx -> k6_mmx
37 37
@@ -40,7 +40,7 @@ Index: gmp-4.2.1/acinclude.m4
40 [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]]) 40 [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
41 41
42 42
43@@ -73,7 +73,7 @@ dnl ---------------------------------- 43@@ -71,7 +71,7 @@
44 dnl Emit code to remove any occurance of ITEM from $LISTVAR. ITEM can be a 44 dnl Emit code to remove any occurance of ITEM from $LISTVAR. ITEM can be a
45 dnl shell expression like $foo if desired. 45 dnl shell expression like $foo if desired.
46 46
@@ -49,9 +49,9 @@ Index: gmp-4.2.1/acinclude.m4
49 [remove_from_list_tmp= 49 [remove_from_list_tmp=
50 for remove_from_list_i in $[][$1]; do 50 for remove_from_list_i in $[][$1]; do
51 if test $remove_from_list_i = [$2]; then :; 51 if test $remove_from_list_i = [$2]; then :;
52@@ -89,12 +89,12 @@ dnl GMP_STRIP_PATH(subdir) 52@@ -87,12 +87,12 @@
53 dnl ---------------------- 53 dnl ----------------------
54 dnl Strip entries */subdir from $path and $fat_path. 54 dnl Strip entries subdir from $path and $fat_path.
55 55
56-define(GMP_STRIP_PATH, 56-define(GMP_STRIP_PATH,
57+define([GMP_STRIP_PATH], 57+define([GMP_STRIP_PATH],
@@ -64,7 +64,7 @@ Index: gmp-4.2.1/acinclude.m4
64 [tmp_path= 64 [tmp_path=
65 for i in $[][$1]; do 65 for i in $[][$1]; do
66 case $i in 66 case $i in
67@@ -115,7 +115,7 @@ dnl 67@@ -113,7 +113,7 @@
68 dnl Dummy values for __GMP_BITS_PER_MP_LIMB and GMP_LIMB_BITS are enough 68 dnl Dummy values for __GMP_BITS_PER_MP_LIMB and GMP_LIMB_BITS are enough
69 dnl for all current configure-time uses of gmp.h. 69 dnl for all current configure-time uses of gmp.h.
70 70
@@ -73,7 +73,7 @@ Index: gmp-4.2.1/acinclude.m4
73 [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ 73 [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */
74 #define GMP_NAIL_BITS $GMP_NAIL_BITS 74 #define GMP_NAIL_BITS $GMP_NAIL_BITS
75 #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */ 75 #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */
76@@ -131,7 +131,7 @@ dnl Expand at autoconf time to the valu 76@@ -129,7 +129,7 @@
77 dnl FILE. The regexps here aren't very rugged, but are enough for gmp. 77 dnl FILE. The regexps here aren't very rugged, but are enough for gmp.
78 dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted. 78 dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
79 79
@@ -82,7 +82,7 @@ Index: gmp-4.2.1/acinclude.m4
82 [patsubst(patsubst( 82 [patsubst(patsubst(
83 esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]), 83 esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
84 [^.*$1[ ]+],[]), 84 [^.*$1[ ]+],[]),
85@@ -145,7 +145,7 @@ dnl The gmp version number, extracted f 85@@ -143,7 +143,7 @@
86 dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits 86 dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits
87 dnl like 3.0.1 if patchlevel > 0. 87 dnl like 3.0.1 if patchlevel > 0.
88 88
@@ -91,10 +91,10 @@ Index: gmp-4.2.1/acinclude.m4
91 [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl 91 [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
92 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl 92 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
93 ifelse(m4_eval(GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in) > 0),1, 93 ifelse(m4_eval(GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in) > 0),1,
94@@ -1491,7 +1491,9 @@ esac 94@@ -1489,7 +1489,9 @@
95 echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4 95 echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
96 96
97 # All CPUs use asm-defs.m4 97 # All CPUs use asm-defs.m4
98-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i 98-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
99+echo -n ["include("] >>$gmp_tmpconfigm4i 99+echo -n ["include("] >>$gmp_tmpconfigm4i
100+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i 100+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
@@ -102,11 +102,11 @@ Index: gmp-4.2.1/acinclude.m4
102 ]) 102 ])
103 103
104 104
105Index: gmp-4.2.1/configure.in 105Index: gmp-4.2.2/configure.in
106=================================================================== 106===================================================================
107--- gmp-4.2.1.orig/configure.in 2006-04-30 00:31:08.000000000 +0100 107--- gmp-4.2.2.orig/configure.in 2007-09-09 17:39:14.000000000 +0100
108+++ gmp-4.2.1/configure.in 2006-11-06 20:39:17.000000000 +0000 108+++ gmp-4.2.2/configure.in 2008-04-30 17:09:10.000000000 +0100
109@@ -31,12 +31,6 @@ AC_REVISION($Revision: 1.11 $) 109@@ -29,12 +29,6 @@
110 AC_PREREQ(2.59) 110 AC_PREREQ(2.59)
111 AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@swox.com, gmp) 111 AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@swox.com, gmp)
112 AC_CONFIG_SRCDIR(gmp-impl.h) 112 AC_CONFIG_SRCDIR(gmp-impl.h)
@@ -119,7 +119,7 @@ Index: gmp-4.2.1/configure.in
119 119
120 # If --target is not used then $target_alias is empty, but if say 120 # If --target is not used then $target_alias is empty, but if say
121 # "./configure athlon-pc-freebsd3.5" is used, then all three of 121 # "./configure athlon-pc-freebsd3.5" is used, then all three of
122@@ -277,7 +271,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1], 122@@ -275,7 +269,7 @@
123 # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is 123 # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
124 # called. User selections of CC etc are respected. 124 # called. User selections of CC etc are respected.
125 # 125 #
@@ -128,7 +128,7 @@ Index: gmp-4.2.1/configure.in
128 # pre-testing, since they of course depend on AC_PROG_CC, and also some of 128 # pre-testing, since they of course depend on AC_PROG_CC, and also some of
129 # them cache their results, which is not wanted. 129 # them cache their results, which is not wanted.
130 # 130 #
131@@ -369,7 +363,7 @@ abilist="standard" 131@@ -367,7 +361,7 @@
132 # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring 132 # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
133 # c89 over cc here. But note that on HP-UX c89 provides a castrated 133 # c89 over cc here. But note that on HP-UX c89 provides a castrated
134 # environment, and would want to be excluded somehow. Maybe 134 # environment, and would want to be excluded somehow. Maybe
@@ -137,7 +137,7 @@ Index: gmp-4.2.1/configure.in
137 # we don't need to worry. 137 # we don't need to worry.
138 # 138 #
139 cclist="gcc cc" 139 cclist="gcc cc"
140@@ -1498,7 +1492,7 @@ esac 140@@ -1518,7 +1512,7 @@
141 CFLAGS_or_unset=${CFLAGS-'(unset)'} 141 CFLAGS_or_unset=${CFLAGS-'(unset)'}
142 CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} 142 CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
143 143
@@ -146,7 +146,7 @@ Index: gmp-4.2.1/configure.in
146 User: 146 User:
147 ABI=$ABI 147 ABI=$ABI
148 CC=$CC 148 CC=$CC
149@@ -1869,7 +1863,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB) 149@@ -1889,7 +1883,6 @@
150 150
151 # The C compiler and preprocessor, put into ANSI mode if possible. 151 # The C compiler and preprocessor, put into ANSI mode if possible.
152 AC_PROG_CC 152 AC_PROG_CC
@@ -154,7 +154,7 @@ Index: gmp-4.2.1/configure.in
154 AC_PROG_CPP 154 AC_PROG_CPP
155 GMP_H_ANSI 155 GMP_H_ANSI
156 156
157@@ -1892,11 +1885,11 @@ AC_SUBST(CCAS) 157@@ -1912,11 +1905,11 @@
158 158
159 # The C++ compiler, if desired. 159 # The C++ compiler, if desired.
160 want_cxx=no 160 want_cxx=no
@@ -168,7 +168,7 @@ Index: gmp-4.2.1/configure.in
168 cxxflags_ac_prog_cxx=$CXXFLAGS 168 cxxflags_ac_prog_cxx=$CXXFLAGS
169 cxxflags_list=ac_prog_cxx 169 cxxflags_list=ac_prog_cxx
170 170
171@@ -2002,7 +1995,7 @@ case $host in 171@@ -2022,7 +2015,7 @@
172 esac 172 esac
173 173
174 174
@@ -177,7 +177,7 @@ Index: gmp-4.2.1/configure.in
177 Decided: 177 Decided:
178 ABI=$ABI 178 ABI=$ABI
179 CC=$CC 179 CC=$CC
180@@ -3175,7 +3168,7 @@ GMP_FINISH 180@@ -3199,7 +3192,7 @@
181 # FIXME: Upcoming version of autoconf/automake may not like broken lines. 181 # FIXME: Upcoming version of autoconf/automake may not like broken lines.
182 # Right now automake isn't accepting the new AC_CONFIG_FILES scheme. 182 # Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
183 183
@@ -186,7 +186,7 @@ Index: gmp-4.2.1/configure.in
186 mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \ 186 mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \
187 mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \ 187 mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \
188 tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \ 188 tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \
189@@ -3184,4 +3177,5 @@ AC_OUTPUT(Makefile \ 189@@ -3208,4 +3201,5 @@
190 tests/cxx/Makefile \ 190 tests/cxx/Makefile \
191 doc/Makefile tune/Makefile \ 191 doc/Makefile tune/Makefile \
192 demos/Makefile demos/calc/Makefile demos/expr/Makefile \ 192 demos/Makefile demos/calc/Makefile demos/expr/Makefile \
diff --git a/meta/packages/gmp/gmp-4.2.1/sh4-asmfix.patch b/meta/packages/gmp/gmp-4.2.2/sh4-asmfix.patch
index 1a01f61..1a01f61 100644
--- a/meta/packages/gmp/gmp-4.2.1/sh4-asmfix.patch
+++ b/meta/packages/gmp/gmp-4.2.2/sh4-asmfix.patch
diff --git a/meta/packages/gmp/gmp-native_4.2.1.bb b/meta/packages/gmp/gmp-native_4.2.2.bb
index 8594f2c..af85db6 100644
--- a/meta/packages/gmp/gmp-native_4.2.1.bb
+++ b/meta/packages/gmp/gmp-native_4.2.2.bb
@@ -1,2 +1,2 @@
1PV = "4.2.1" 1PV = "4.2.2"
2require gmp-native.inc 2require gmp-native.inc
diff --git a/meta/packages/gmp/gmp.inc b/meta/packages/gmp/gmp.inc
index ad17916..71ea128 100644
--- a/meta/packages/gmp/gmp.inc
+++ b/meta/packages/gmp/gmp.inc
@@ -9,6 +9,8 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \
9 9
10inherit autotools 10inherit autotools
11 11
12ARM_INSTRUCTION_SET = "arm"
13
12acpaths = "" 14acpaths = ""
13 15
14do_stage () { 16do_stage () {
diff --git a/meta/packages/gmp/gmp_4.2.1.bb b/meta/packages/gmp/gmp_4.2.2.bb
index 6af2db6..6af2db6 100644
--- a/meta/packages/gmp/gmp_4.2.1.bb
+++ b/meta/packages/gmp/gmp_4.2.2.bb