summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-02-01 15:40:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-03 15:56:36 +0000
commitf5d505e0cdd48ad9ac5597637c1fbf99578d3b01 (patch)
tree8f9b8715d07924eee91c674b734643e2c76516d6 /meta/recipes-support
parent0637f1b409f1517eb809317236b5f9edd80b270a (diff)
downloadpoky-f5d505e0cdd48ad9ac5597637c1fbf99578d3b01.tar.gz
gmp: upgrade from 5.0.2 to 5.0.3
rebased configure.patch & amd64.patchto the newer code. Removed sh4-asmfix.patch as it is not needed with the newer code. (From OE-Core rev: 7c33a18ed5cdca6765d04ad9e4387001f72993a4) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/gmp/gmp/amd64.patch8
-rw-r--r--meta/recipes-support/gmp/gmp/configure.patch60
-rw-r--r--meta/recipes-support/gmp/gmp/sh4-asmfix.patch28
-rw-r--r--meta/recipes-support/gmp/gmp_5.0.3.bb (renamed from meta/recipes-support/gmp/gmp_5.0.2.bb)9
4 files changed, 45 insertions, 60 deletions
diff --git a/meta/recipes-support/gmp/gmp/amd64.patch b/meta/recipes-support/gmp/gmp/amd64.patch
index 38c89c7a12..564d12d42b 100644
--- a/meta/recipes-support/gmp/gmp/amd64.patch
+++ b/meta/recipes-support/gmp/gmp/amd64.patch
@@ -1,8 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3--- gmp-4.1.4/longlong.h.orig 2004-04-22 00:34:28.000000000 +0200 3Index: gmp-5.0.3/longlong.h
4+++ gmp-4.1.4/longlong.h 2005-07-18 01:13:06.000000000 +0200 4===================================================================
5@@ -738,8 +738,10 @@ 5--- gmp-5.0.3.orig/longlong.h
6+++ gmp-5.0.3/longlong.h
7@@ -994,8 +994,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
6 count is only an int. */ 8 count is only an int. */
7 #define count_trailing_zeros(count, x) \ 9 #define count_trailing_zeros(count, x) \
8 do { \ 10 do { \
diff --git a/meta/recipes-support/gmp/gmp/configure.patch b/meta/recipes-support/gmp/gmp/configure.patch
index 638feaddb7..7597a935a2 100644
--- a/meta/recipes-support/gmp/gmp/configure.patch
+++ b/meta/recipes-support/gmp/gmp/configure.patch
@@ -4,11 +4,11 @@ Upstream-Status: Pending
4 configure.in | 24 +++++++++--------------- 4 configure.in | 24 +++++++++---------------
5 2 files changed, 23 insertions(+), 27 deletions(-) 5 2 files changed, 23 insertions(+), 27 deletions(-)
6 6
7Index: gmp-5.0.1/acinclude.m4 7Index: gmp-5.0.3/acinclude.m4
8=================================================================== 8===================================================================
9--- gmp-5.0.1.orig/acinclude.m4 9--- gmp-5.0.3.orig/acinclude.m4
10+++ gmp-5.0.1/acinclude.m4 10+++ gmp-5.0.3/acinclude.m4
11@@ -30,20 +30,20 @@ dnl a_out.exe - OpenVMS DEC C called 11@@ -30,29 +30,29 @@ dnl a_out.exe - OpenVMS DEC C called
12 dnl conftest.exe - various DOS compilers 12 dnl conftest.exe - various DOS compilers
13 13
14 14
@@ -28,12 +28,24 @@ Index: gmp-5.0.1/acinclude.m4
28+define([POWERPC64_PATTERN], 28+define([POWERPC64_PATTERN],
29 [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]]) 29 [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]])
30 30
31-define(S390_PATTERN,
32+define([S390_PATTERN],
33 [[s390-*-* | z900esa-*-* | z990esa-*-* | z9esa-*-* | z10esa-*-* | z196esa-*-*]])
34
35-define(S390X_PATTERN,
36+define([S390X_PATTERN],
37 [[s390x-*-* | z900-*-* | z990-*-* | z9-*-* | z10-*-* | z196-*-*]])
38
31-define(X86_PATTERN, 39-define(X86_PATTERN,
32+define([X86_PATTERN], 40+define([X86_PATTERN],
33 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]]) 41 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
34 42
35 define(X86_64_PATTERN, 43-define(X86_64_PATTERN,
36@@ -64,7 +64,7 @@ dnl x86 -> x86 44+define([X86_64_PATTERN],
45 [[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | bulldozer-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-*]])
46
47 dnl GMP_FAT_SUFFIX(DSTVAR, DIRECTORY)
48@@ -70,7 +70,7 @@ dnl x86 -> x86
37 dnl x86/k6 -> k6 49 dnl x86/k6 -> k6
38 dnl x86/k6/mmx -> k6_mmx 50 dnl x86/k6/mmx -> k6_mmx
39 51
@@ -42,7 +54,7 @@ Index: gmp-5.0.1/acinclude.m4
42 [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]]) 54 [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
43 55
44 56
45@@ -73,7 +73,7 @@ dnl ---------------------------------- 57@@ -79,7 +79,7 @@ dnl ----------------------------------
46 dnl Emit code to remove any occurrence of ITEM from $LISTVAR. ITEM can be a 58 dnl Emit code to remove any occurrence of ITEM from $LISTVAR. ITEM can be a
47 dnl shell expression like $foo if desired. 59 dnl shell expression like $foo if desired.
48 60
@@ -51,7 +63,7 @@ Index: gmp-5.0.1/acinclude.m4
51 [remove_from_list_tmp= 63 [remove_from_list_tmp=
52 for remove_from_list_i in $[][$1]; do 64 for remove_from_list_i in $[][$1]; do
53 if test $remove_from_list_i = [$2]; then :; 65 if test $remove_from_list_i = [$2]; then :;
54@@ -89,12 +89,12 @@ dnl GMP_STRIP_PATH(subdir) 66@@ -95,12 +95,12 @@ dnl GMP_STRIP_PATH(subdir)
55 dnl ---------------------- 67 dnl ----------------------
56 dnl Strip entries */subdir from $path and $fat_path. 68 dnl Strip entries */subdir from $path and $fat_path.
57 69
@@ -66,7 +78,7 @@ Index: gmp-5.0.1/acinclude.m4
66 [tmp_path= 78 [tmp_path=
67 for i in $[][$1]; do 79 for i in $[][$1]; do
68 case $i in 80 case $i in
69@@ -115,7 +115,7 @@ dnl 81@@ -121,7 +121,7 @@ dnl
70 dnl Dummy value for GMP_LIMB_BITS is enough 82 dnl Dummy value for GMP_LIMB_BITS is enough
71 dnl for all current configure-time uses of gmp.h. 83 dnl for all current configure-time uses of gmp.h.
72 84
@@ -75,7 +87,7 @@ Index: gmp-5.0.1/acinclude.m4
75 [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ 87 [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */
76 #define GMP_NAIL_BITS $GMP_NAIL_BITS 88 #define GMP_NAIL_BITS $GMP_NAIL_BITS
77 #define GMP_LIMB_BITS 123 89 #define GMP_LIMB_BITS 123
78@@ -130,7 +130,7 @@ dnl Expand at autoconf time to the valu 90@@ -136,7 +136,7 @@ dnl Expand at autoconf time to the valu
79 dnl FILE. The regexps here aren't very rugged, but are enough for gmp. 91 dnl FILE. The regexps here aren't very rugged, but are enough for gmp.
80 dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted. 92 dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
81 93
@@ -84,7 +96,7 @@ Index: gmp-5.0.1/acinclude.m4
84 [patsubst(patsubst( 96 [patsubst(patsubst(
85 esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]), 97 esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
86 [^.*$1[ ]+],[]), 98 [^.*$1[ ]+],[]),
87@@ -144,7 +144,7 @@ dnl The gmp version number, extracted f 99@@ -150,7 +150,7 @@ dnl The gmp version number, extracted f
88 dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits 100 dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits
89 dnl like 3.0.1 if patchlevel > 0. 101 dnl like 3.0.1 if patchlevel > 0.
90 102
@@ -93,7 +105,7 @@ Index: gmp-5.0.1/acinclude.m4
93 [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl 105 [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
94 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl 106 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
95 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)]) 107 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
96@@ -1506,7 +1506,9 @@ esac 108@@ -1512,7 +1512,9 @@ esac
97 echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4 109 echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
98 110
99 # All CPUs use asm-defs.m4 111 # All CPUs use asm-defs.m4
@@ -104,13 +116,13 @@ Index: gmp-5.0.1/acinclude.m4
104 ]) 116 ])
105 117
106 118
107Index: gmp-5.0.1/configure.in 119Index: gmp-5.0.3/configure.in
108=================================================================== 120===================================================================
109--- gmp-5.0.1.orig/configure.in 121--- gmp-5.0.3.orig/configure.in
110+++ gmp-5.0.1/configure.in 122+++ gmp-5.0.3/configure.in
111@@ -29,12 +29,6 @@ AC_REVISION($Revision$) 123@@ -29,12 +29,6 @@ AC_REVISION($Revision$)
112 AC_PREREQ(2.59) 124 AC_PREREQ(2.59)
113 AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@gmplib.org, gmp) 125 AC_INIT(GNU MP, GMP_VERSION, [gmp-bugs@gmplib.org, see http://gmplib.org/manual/Reporting-Bugs.html], gmp)
114 AC_CONFIG_SRCDIR(gmp-impl.h) 126 AC_CONFIG_SRCDIR(gmp-impl.h)
115-m4_pattern_forbid([^[ \t]*GMP_]) 127-m4_pattern_forbid([^[ \t]*GMP_])
116-m4_pattern_allow(GMP_LDFLAGS) 128-m4_pattern_allow(GMP_LDFLAGS)
@@ -121,7 +133,7 @@ Index: gmp-5.0.1/configure.in
121 133
122 # If --target is not used then $target_alias is empty, but if say 134 # If --target is not used then $target_alias is empty, but if say
123 # "./configure athlon-pc-freebsd3.5" is used, then all three of 135 # "./configure athlon-pc-freebsd3.5" is used, then all three of
124@@ -303,7 +297,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1], 136@@ -311,7 +305,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1],
125 # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is 137 # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
126 # called. User selections of CC etc are respected. 138 # called. User selections of CC etc are respected.
127 # 139 #
@@ -130,7 +142,7 @@ Index: gmp-5.0.1/configure.in
130 # pre-testing, since they of course depend on AC_PROG_CC, and also some of 142 # pre-testing, since they of course depend on AC_PROG_CC, and also some of
131 # them cache their results, which is not wanted. 143 # them cache their results, which is not wanted.
132 # 144 #
133@@ -395,7 +389,7 @@ abilist="standard" 145@@ -403,7 +397,7 @@ abilist="standard"
134 # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring 146 # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
135 # c89 over cc here. But note that on HP-UX c89 provides a castrated 147 # c89 over cc here. But note that on HP-UX c89 provides a castrated
136 # environment, and would want to be excluded somehow. Maybe 148 # environment, and would want to be excluded somehow. Maybe
@@ -139,7 +151,7 @@ Index: gmp-5.0.1/configure.in
139 # we don't need to worry. 151 # we don't need to worry.
140 # 152 #
141 cclist="gcc cc" 153 cclist="gcc cc"
142@@ -1580,7 +1574,7 @@ esac 154@@ -1666,7 +1660,7 @@ esac
143 CFLAGS_or_unset=${CFLAGS-'(unset)'} 155 CFLAGS_or_unset=${CFLAGS-'(unset)'}
144 CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} 156 CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
145 157
@@ -148,7 +160,7 @@ Index: gmp-5.0.1/configure.in
148 User: 160 User:
149 ABI=$ABI 161 ABI=$ABI
150 CC=$CC 162 CC=$CC
151@@ -1987,7 +1981,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB) 163@@ -2073,7 +2067,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
152 164
153 # The C compiler and preprocessor, put into ANSI mode if possible. 165 # The C compiler and preprocessor, put into ANSI mode if possible.
154 AC_PROG_CC 166 AC_PROG_CC
@@ -156,7 +168,7 @@ Index: gmp-5.0.1/configure.in
156 AC_PROG_CPP 168 AC_PROG_CPP
157 GMP_H_ANSI 169 GMP_H_ANSI
158 170
159@@ -2010,11 +2003,11 @@ AC_SUBST(CCAS) 171@@ -2096,11 +2089,11 @@ AC_SUBST(CCAS)
160 172
161 # The C++ compiler, if desired. 173 # The C++ compiler, if desired.
162 want_cxx=no 174 want_cxx=no
@@ -170,7 +182,7 @@ Index: gmp-5.0.1/configure.in
170 cxxflags_ac_prog_cxx=$CXXFLAGS 182 cxxflags_ac_prog_cxx=$CXXFLAGS
171 cxxflags_list=ac_prog_cxx 183 cxxflags_list=ac_prog_cxx
172 184
173@@ -2120,7 +2113,7 @@ case $host in 185@@ -2206,7 +2199,7 @@ case $host in
174 esac 186 esac
175 187
176 188
@@ -179,7 +191,7 @@ Index: gmp-5.0.1/configure.in
179 Decided: 191 Decided:
180 ABI=$ABI 192 ABI=$ABI
181 CC=$CC 193 CC=$CC
182@@ -3376,7 +3369,7 @@ GMP_FINISH 194@@ -3465,7 +3458,7 @@ GMP_FINISH
183 # FIXME: Upcoming version of autoconf/automake may not like broken lines. 195 # FIXME: Upcoming version of autoconf/automake may not like broken lines.
184 # Right now automake isn't accepting the new AC_CONFIG_FILES scheme. 196 # Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
185 197
@@ -188,7 +200,7 @@ Index: gmp-5.0.1/configure.in
188 mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \ 200 mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \
189 mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \ 201 mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \
190 tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \ 202 tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \
191@@ -3385,4 +3378,5 @@ AC_OUTPUT(Makefile \ 203@@ -3474,4 +3467,5 @@ AC_OUTPUT(Makefile \
192 tests/cxx/Makefile \ 204 tests/cxx/Makefile \
193 doc/Makefile tune/Makefile \ 205 doc/Makefile tune/Makefile \
194 demos/Makefile demos/calc/Makefile demos/expr/Makefile \ 206 demos/Makefile demos/calc/Makefile demos/expr/Makefile \
diff --git a/meta/recipes-support/gmp/gmp/sh4-asmfix.patch b/meta/recipes-support/gmp/gmp/sh4-asmfix.patch
deleted file mode 100644
index ac25110e9b..0000000000
--- a/meta/recipes-support/gmp/gmp/sh4-asmfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Upstream-Status: Pending
2
3--- gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:44:00 1.1
4+++ gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:18:57
5@@ -29,8 +29,8 @@
6
7 .text
8 .align 2
9- .global ___gmpn_add_n
10-___gmpn_add_n:
11+ .global __gmpn_add_n
12+__gmpn_add_n:
13 mov #0,r3 ! clear cy save reg
14
15 Loop: mov.l @r5+,r1
16--- gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:44:04 1.1
17+++ gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:18:59
18@@ -29,8 +29,8 @@
19
20 .text
21 .align 2
22- .global ___gmpn_sub_n
23-___gmpn_sub_n:
24+ .global __gmpn_sub_n
25+__gmpn_sub_n:
26 mov #0,r3 ! clear cy save reg
27
28 Loop: mov.l @r5+,r1
diff --git a/meta/recipes-support/gmp/gmp_5.0.2.bb b/meta/recipes-support/gmp/gmp_5.0.3.bb
index d39e500654..9f37943e84 100644
--- a/meta/recipes-support/gmp/gmp_5.0.2.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.3.bb
@@ -2,14 +2,13 @@ require gmp.inc
2LICENSE="LGPLv3&GPLv3" 2LICENSE="LGPLv3&GPLv3"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790" 4 file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
5PR = "r4" 5PR = "r0"
6 6
7SRC_URI_append += "file://sh4-asmfix.patch \ 7SRC_URI_append += "file://gmp_bugfix.patch \
8 file://gmp_bugfix.patch \
9 file://use-includedir.patch \ 8 file://use-includedir.patch \
10 file://gmp_fix_for_x32.patch" 9 file://gmp_fix_for_x32.patch"
11 10
12export CC_FOR_BUILD = "${BUILD_CC}" 11export CC_FOR_BUILD = "${BUILD_CC}"
13 12
14SRC_URI[md5sum] = "0bbaedc82fb30315b06b1588b9077cd3" 13SRC_URI[md5sum] = "8061f765cc86b9765921a0c800615804"
15SRC_URI[sha256sum] = "dbc2db76fdd4e99f85d5e35aa378ed62c283e0d586b91bd8703aff75a7804c28" 14SRC_URI[sha256sum] = "dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3"