summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-07-12 00:18:43 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-16 16:25:16 +0100
commit41e668e781b399835b686145215ded776fbe3a73 (patch)
tree69d268e7c437195fbb8b3d2f1d0acb3631418f53
parent227fd49276c4a81980fe9452633dcab73c32c815 (diff)
downloadpoky-41e668e781b399835b686145215ded776fbe3a73.tar.gz
gmp: upgrade from 4.2.4 to 5.0.1
Change SECTION to devel Rebased the configure patch to the newer code. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta/packages/gmp/gmp.inc10
-rw-r--r--meta/packages/gmp/gmp/amd64.patch (renamed from meta/packages/gmp/gmp-4.2.4/amd64.patch)0
-rw-r--r--meta/packages/gmp/gmp/configure.patch (renamed from meta/packages/gmp/gmp-4.2.4/configure.patch)60
-rw-r--r--meta/packages/gmp/gmp/sh4-asmfix.patch (renamed from meta/packages/gmp/gmp-4.2.4/sh4-asmfix.patch)0
-rw-r--r--meta/packages/gmp/gmp/use-includedir.patch (renamed from meta/packages/gmp/gmp-4.2.4/use-includedir.patch)0
-rw-r--r--meta/packages/gmp/gmp_4.2.4.bb9
-rw-r--r--meta/packages/gmp/gmp_5.0.1.bb7
7 files changed, 43 insertions, 43 deletions
diff --git a/meta/packages/gmp/gmp.inc b/meta/packages/gmp/gmp.inc
index 6023910308..6b56f7e7c8 100644
--- a/meta/packages/gmp/gmp.inc
+++ b/meta/packages/gmp/gmp.inc
@@ -1,14 +1,16 @@
1SECTION = "libs" 1SECTION = "devel"
2DESCRIPTION = "GNU multiprecision arithmetic library" 2DESCRIPTION = "GNU multiprecision arithmetic library"
3HOMEPAGE = "http://www.swox.com/gmp/" 3HOMEPAGE = "http://www.swox.com/gmp/"
4LICENSE = "GPL LGPL" 4LICENSE = "GPLv3 LGPLv3"
5 5
6SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \ 6SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \
7 file://configure.patch;patch=1 \ 7 file://configure.patch \
8 file://amd64.patch;patch=1" 8 file://amd64.patch "
9 9
10inherit autotools 10inherit autotools
11 11
12ARM_INSTRUCTION_SET = "arm" 12ARM_INSTRUCTION_SET = "arm"
13 13
14acpaths = "" 14acpaths = ""
15
16BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/packages/gmp/gmp-4.2.4/amd64.patch b/meta/packages/gmp/gmp/amd64.patch
index 67be9dd350..67be9dd350 100644
--- a/meta/packages/gmp/gmp-4.2.4/amd64.patch
+++ b/meta/packages/gmp/gmp/amd64.patch
diff --git a/meta/packages/gmp/gmp-4.2.4/configure.patch b/meta/packages/gmp/gmp/configure.patch
index 8056953230..ed0c02d86c 100644
--- a/meta/packages/gmp/gmp-4.2.4/configure.patch
+++ b/meta/packages/gmp/gmp/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.4/acinclude.m4 5Index: gmp-5.0.1/acinclude.m4
6=================================================================== 6===================================================================
7--- gmp-4.2.4.orig/acinclude.m4 2008-09-05 14:21:12.000000000 +0200 7--- gmp-5.0.1.orig/acinclude.m4
8+++ gmp-4.2.4/acinclude.m4 2008-10-15 23:37:38.062976613 +0200 8+++ gmp-5.0.1/acinclude.m4
9@@ -30,20 +30,20 @@ 9@@ -30,20 +30,20 @@ dnl a_out.exe - OpenVMS DEC C called
10 dnl conftest.exe - various DOS compilers 10 dnl conftest.exe - various DOS compilers
11 11
12 12
@@ -28,10 +28,10 @@ Index: gmp-4.2.4/acinclude.m4
28 28
29-define(X86_PATTERN, 29-define(X86_PATTERN,
30+define([X86_PATTERN], 30+define([X86_PATTERN],
31 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-*]]) 31 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
32 32
33 33 define(X86_64_PATTERN,
34@@ -62,7 +62,7 @@ 34@@ -64,7 +64,7 @@ dnl x86 -> x86
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,8 +40,8 @@ Index: gmp-4.2.4/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@@ -71,7 +71,7 @@ 43@@ -73,7 +73,7 @@ dnl ----------------------------------
44 dnl Emit code to remove any occurance of ITEM from $LISTVAR. ITEM can be a 44 dnl Emit code to remove any occurrence 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
47-define(GMP_REMOVE_FROM_LIST, 47-define(GMP_REMOVE_FROM_LIST,
@@ -49,7 +49,7 @@ Index: gmp-4.2.4/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@@ -87,12 +87,12 @@ 52@@ -89,12 +89,12 @@ dnl GMP_STRIP_PATH(subdir)
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
@@ -64,16 +64,16 @@ Index: gmp-4.2.4/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@@ -113,7 +113,7 @@ 67@@ -115,7 +115,7 @@ dnl
68 dnl Dummy values for __GMP_BITS_PER_MP_LIMB and GMP_LIMB_BITS are enough 68 dnl Dummy value for GMP_LIMB_BITS is 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
71-define(GMP_INCLUDE_GMP_H, 71-define(GMP_INCLUDE_GMP_H,
72+define([GMP_INCLUDE_GMP_H], 72+define([GMP_INCLUDE_GMP_H],
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_LIMB_BITS 123
76@@ -129,7 +129,7 @@ 76@@ -130,7 +130,7 @@ dnl Expand at autoconf time to the valu
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.4/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@@ -143,7 +143,7 @@ 85@@ -144,7 +144,7 @@ dnl The gmp version number, extracted f
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
@@ -90,8 +90,8 @@ Index: gmp-4.2.4/acinclude.m4
90+define([GMP_VERSION], 90+define([GMP_VERSION],
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 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
94@@ -1506,7 +1506,9 @@ 94@@ -1506,7 +1506,9 @@ esac
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
@@ -102,13 +102,13 @@ Index: gmp-4.2.4/acinclude.m4
102 ]) 102 ])
103 103
104 104
105Index: gmp-4.2.4/configure.in 105Index: gmp-5.0.1/configure.in
106=================================================================== 106===================================================================
107--- gmp-4.2.4.orig/configure.in 2008-08-01 19:24:04.000000000 +0200 107--- gmp-5.0.1.orig/configure.in
108+++ gmp-4.2.4/configure.in 2008-10-15 23:35:03.466325346 +0200 108+++ gmp-5.0.1/configure.in
109@@ -29,12 +29,6 @@ 109@@ -29,12 +29,6 @@ AC_REVISION($Revision$)
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@gmplib.org, gmp)
112 AC_CONFIG_SRCDIR(gmp-impl.h) 112 AC_CONFIG_SRCDIR(gmp-impl.h)
113-m4_pattern_forbid([^[ \t]*GMP_]) 113-m4_pattern_forbid([^[ \t]*GMP_])
114-m4_pattern_allow(GMP_LDFLAGS) 114-m4_pattern_allow(GMP_LDFLAGS)
@@ -119,7 +119,7 @@ Index: gmp-4.2.4/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@@ -278,7 +272,7 @@ 122@@ -303,7 +297,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1],
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.4/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@@ -370,7 +364,7 @@ 131@@ -395,7 +389,7 @@ abilist="standard"
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.4/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@@ -1525,7 +1519,7 @@ 140@@ -1580,7 +1574,7 @@ esac
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.4/configure.in
146 User: 146 User:
147 ABI=$ABI 147 ABI=$ABI
148 CC=$CC 148 CC=$CC
149@@ -1896,7 +1890,6 @@ 149@@ -1987,7 +1981,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
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.4/configure.in
154 AC_PROG_CPP 154 AC_PROG_CPP
155 GMP_H_ANSI 155 GMP_H_ANSI
156 156
157@@ -1919,11 +1912,11 @@ 157@@ -2010,11 +2003,11 @@ AC_SUBST(CCAS)
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.4/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@@ -2029,7 +2022,7 @@ 171@@ -2120,7 +2113,7 @@ case $host in
172 esac 172 esac
173 173
174 174
@@ -177,7 +177,7 @@ Index: gmp-4.2.4/configure.in
177 Decided: 177 Decided:
178 ABI=$ABI 178 ABI=$ABI
179 CC=$CC 179 CC=$CC
180@@ -3208,7 +3201,7 @@ 180@@ -3376,7 +3369,7 @@ GMP_FINISH
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.4/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@@ -3217,4 +3210,5 @@ 189@@ -3385,4 +3378,5 @@ AC_OUTPUT(Makefile \
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.4/sh4-asmfix.patch b/meta/packages/gmp/gmp/sh4-asmfix.patch
index 1a01f61533..1a01f61533 100644
--- a/meta/packages/gmp/gmp-4.2.4/sh4-asmfix.patch
+++ b/meta/packages/gmp/gmp/sh4-asmfix.patch
diff --git a/meta/packages/gmp/gmp-4.2.4/use-includedir.patch b/meta/packages/gmp/gmp/use-includedir.patch
index ee3891f807..ee3891f807 100644
--- a/meta/packages/gmp/gmp-4.2.4/use-includedir.patch
+++ b/meta/packages/gmp/gmp/use-includedir.patch
diff --git a/meta/packages/gmp/gmp_4.2.4.bb b/meta/packages/gmp/gmp_4.2.4.bb
deleted file mode 100644
index 5c1bdc9828..0000000000
--- a/meta/packages/gmp/gmp_4.2.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1PR = "r0"
2
3SRC_URI_append += "file://sh4-asmfix.patch;patch=1 \
4 file://use-includedir.patch;patch=1 \
5 "
6require gmp.inc
7LICENSE = "GPLv3 LGPLv3"
8
9BBCLASSEXTEND = "native nativesdk" \ No newline at end of file
diff --git a/meta/packages/gmp/gmp_5.0.1.bb b/meta/packages/gmp/gmp_5.0.1.bb
new file mode 100644
index 0000000000..dd908bd7ca
--- /dev/null
+++ b/meta/packages/gmp/gmp_5.0.1.bb
@@ -0,0 +1,7 @@
1require gmp.inc
2
3PR = "r0"
4
5SRC_URI_append += "file://sh4-asmfix.patch \
6 file://use-includedir.patch "
7