summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-02 20:37:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 11:09:40 +0000
commit9f5e0b8fec193846d531ac59c2f91297325eff6c (patch)
treed142f6a0f75e6aa8cd207022d35a8c08605ea183 /meta
parent60284f0ac8f90f891f530d614f3b3f7ccc1288b7 (diff)
downloadpoky-9f5e0b8fec193846d531ac59c2f91297325eff6c.tar.gz
gmp: update to upstream version 5.1.0
New version of configure.patch added for gmp-5.1.0. Old patch moved to gmp-4.2.1 specific directory. gmp_fix_for_automake-1.12.patch part of upstŕeam so removed gmp-5 version, gmp-4.2.1 version remains. (From OE-Core rev: ebd56f6a12c55982467b34b9c4feae03358738fe) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gmp/gmp-4.2.1/configure.patch (renamed from meta/recipes-support/gmp/gmp/configure.patch)0
-rw-r--r--meta/recipes-support/gmp/gmp-5.1.0/configure.patch210
-rw-r--r--meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch48
-rw-r--r--meta/recipes-support/gmp/gmp_5.1.0.bb (renamed from meta/recipes-support/gmp/gmp_5.0.5.bb)5
4 files changed, 212 insertions, 51 deletions
diff --git a/meta/recipes-support/gmp/gmp/configure.patch b/meta/recipes-support/gmp/gmp-4.2.1/configure.patch
index 7597a935a2..7597a935a2 100644
--- a/meta/recipes-support/gmp/gmp/configure.patch
+++ b/meta/recipes-support/gmp/gmp-4.2.1/configure.patch
diff --git a/meta/recipes-support/gmp/gmp-5.1.0/configure.patch b/meta/recipes-support/gmp/gmp-5.1.0/configure.patch
new file mode 100644
index 0000000000..fb5435cb40
--- /dev/null
+++ b/meta/recipes-support/gmp/gmp-5.1.0/configure.patch
@@ -0,0 +1,210 @@
1Upstream-Status: Pending
2
3Updated to apply to gmp-5.1.0
4
5Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
6
7diff -Nurd gmp-5.1.0/acinclude.m4 gmp-5.1.0/acinclude.m4
8--- gmp-5.1.0/acinclude.m4 2012-12-18 21:05:09.000000000 +0200
9+++ gmp-5.1.0/acinclude.m4 2013-01-02 05:19:26.977013073 +0200
10@@ -30,29 +30,29 @@
11 dnl conftest.exe - various DOS compilers
12
13
14-define(IA64_PATTERN,
15+define([IA64_PATTERN],
16 [[ia64*-*-* | itanium-*-* | itanium2-*-*]])
17
18 dnl Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all
19 dnl of which config.sub accepts. (Though none of which are likely to work
20 dnl with GMP.)
21 dnl
22-define(M68K_PATTERN,
23+define([M68K_PATTERN],
24 [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]])
25
26-define(POWERPC64_PATTERN,
27+define([POWERPC64_PATTERN],
28 [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]])
29
30-define(S390_PATTERN,
31+define([S390_PATTERN],
32 [[s390-*-* | z900esa-*-* | z990esa-*-* | z9esa-*-* | z10esa-*-* | z196esa-*-*]])
33
34-define(S390X_PATTERN,
35+define([S390X_PATTERN],
36 [[s390x-*-* | z900-*-* | z990-*-* | z9-*-* | z10-*-* | z196-*-*]])
37
38-define(X86_PATTERN,
39+define([X86_PATTERN],
40 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
41
42-define(X86_64_PATTERN,
43+define([X86_64_PATTERN],
44 [[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | bulldozer-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-*]])
45
46 dnl GMP_FAT_SUFFIX(DSTVAR, DIRECTORY)
47@@ -70,7 +70,7 @@
48 dnl x86/k6 -> k6
49 dnl x86/k6/mmx -> k6_mmx
50
51-define(GMP_FAT_SUFFIX,
52+define([GMP_FAT_SUFFIX],
53 [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
54
55
56@@ -79,7 +79,7 @@
57 dnl Emit code to remove any occurrence of ITEM from $LISTVAR. ITEM can be a
58 dnl shell expression like $foo if desired.
59
60-define(GMP_REMOVE_FROM_LIST,
61+define([GMP_REMOVE_FROM_LIST],
62 [remove_from_list_tmp=
63 for remove_from_list_i in $[][$1]; do
64 if test $remove_from_list_i = [$2]; then :;
65@@ -95,12 +95,12 @@
66 dnl ----------------------
67 dnl Strip entries */subdir from $path and $fat_path.
68
69-define(GMP_STRIP_PATH,
70+define([GMP_STRIP_PATH],
71 [GMP_STRIP_PATH_VAR(path, [$1])
72 GMP_STRIP_PATH_VAR(fat_path, [$1])
73 ])
74
75-define(GMP_STRIP_PATH_VAR,
76+define([GMP_STRIP_PATH_VAR],
77 [tmp_path=
78 for i in $[][$1]; do
79 case $i in
80@@ -121,7 +121,7 @@
81 dnl Dummy value for GMP_LIMB_BITS is enough
82 dnl for all current configure-time uses of gmp.h.
83
84-define(GMP_INCLUDE_GMP_H,
85+define([GMP_INCLUDE_GMP_H],
86 [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */
87 #define GMP_NAIL_BITS $GMP_NAIL_BITS
88 #define GMP_LIMB_BITS 123
89@@ -136,7 +136,7 @@
90 dnl FILE. The regexps here aren't very rugged, but are enough for gmp.
91 dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
92
93-define(GMP_HEADER_GETVAL,
94+define([GMP_HEADER_GETVAL],
95 [patsubst(patsubst(
96 esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
97 [^.*$1[ ]+],[]),
98@@ -150,7 +150,7 @@
99 dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits
100 dnl like 3.0.1 if patchlevel > 0.
101
102-define(GMP_VERSION,
103+define([GMP_VERSION],
104 [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
105 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
106 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
107@@ -1512,7 +1512,9 @@
108 echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
109
110 # All CPUs use asm-defs.m4
111-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
112+echo -n ["include("] >>$gmp_tmpconfigm4i
113+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
114+echo [")"] >>$gmp_tmpconfigm4i
115 ])
116
117
118diff -Nurd gmp-5.1.0/configure.in gmp-5.1.0/configure.in
119--- gmp-5.1.0/configure.in 2012-12-18 21:05:09.000000000 +0200
120+++ gmp-5.1.0/configure.in 2013-01-02 05:19:26.977013073 +0200
121@@ -29,13 +29,6 @@
122 AC_PREREQ(2.59)
123 AC_INIT(GNU MP, GMP_VERSION, [gmp-bugs@gmplib.org, see http://gmplib.org/manual/Reporting-Bugs.html], gmp)
124 AC_CONFIG_SRCDIR(gmp-impl.h)
125-m4_pattern_forbid([^[ \t]*GMP_])
126-m4_pattern_allow(GMP_LDFLAGS)
127-m4_pattern_allow(GMP_LIMB_BITS)
128-m4_pattern_allow(GMP_MPARAM_H_SUGGEST)
129-m4_pattern_allow(GMP_NAIL_BITS)
130-m4_pattern_allow(GMP_NUMB_BITS)
131-m4_pattern_allow(GMP_NONSTD_ABI)
132
133 # If --target is not used then $target_alias is empty, but if say
134 # "./configure athlon-pc-freebsd3.5" is used, then all three of
135@@ -314,7 +307,7 @@
136 # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
137 # called. User selections of CC etc are respected.
138 #
139-# Care is taken not to use macros like AC_TRY_COMPILE during the GMP
140+# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP
141 # pre-testing, since they of course depend on AC_PROG_CC, and also some of
142 # them cache their results, which is not wanted.
143 #
144@@ -406,7 +399,7 @@
145 # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
146 # c89 over cc here. But note that on HP-UX c89 provides a castrated
147 # environment, and would want to be excluded somehow. Maybe
148-# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and
149+# already does enough to stick cc into ANSI mode and
150 # we don't need to worry.
151 #
152 cclist="gcc cc"
153@@ -1727,7 +1720,7 @@
154 CFLAGS_or_unset=${CFLAGS-'(unset)'}
155 CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
156
157-cat >&AC_FD_CC <<EOF
158+cat >&AS_MESSAGE_LOG_FD() <<EOF
159 User:
160 ABI=$ABI
161 CC=$CC
162@@ -2147,7 +2140,6 @@
163
164 # The C compiler and preprocessor, put into ANSI mode if possible.
165 AC_PROG_CC
166-AC_PROG_CC_STDC
167 AC_PROG_CPP
168
169
170@@ -2169,11 +2161,11 @@
171
172 # The C++ compiler, if desired.
173 want_cxx=no
174+AC_PROG_CXX
175 if test $enable_cxx != no; then
176 test_CXXFLAGS=${CXXFLAGS+set}
177- AC_PROG_CXX
178
179- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC
180+ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD()
181 cxxflags_ac_prog_cxx=$CXXFLAGS
182 cxxflags_list=ac_prog_cxx
183
184@@ -2289,7 +2281,7 @@
185 fi
186
187
188-cat >&AC_FD_CC <<EOF
189+cat >&AS_MESSAGE_LOG_FD() <<EOF
190 Decided:
191 ABI=$ABI
192 CC=$CC
193@@ -3638,7 +3630,7 @@
194 # FIXME: Upcoming version of autoconf/automake may not like broken lines.
195 # Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
196
197-AC_OUTPUT(Makefile \
198+AC_CONFIG_FILES([Makefile \
199 mpf/Makefile mpn/Makefile mpq/Makefile \
200 mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile \
201 tests/Makefile tests/devel/Makefile \
202@@ -3647,7 +3639,8 @@
203 tests/cxx/Makefile \
204 doc/Makefile tune/Makefile \
205 demos/Makefile demos/calc/Makefile demos/expr/Makefile \
206- gmp.h:gmp-h.in)
207+ gmp.h:gmp-h.in])
208+AC_OUTPUT
209
210 AC_MSG_NOTICE([summary of build options:
diff --git a/meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch b/meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch
deleted file mode 100644
index 8ff1bcfad2..0000000000
--- a/meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Upstream-Status: Pending
2
3automake 1.12 has depricated automatic de-ANSI-fication support
4
5this patch avoids these kinds of errors:
6
7| configure.in:2240: error: automatic de-ANSI-fication support has been removed
8| Makefile.am:28: error: automatic de-ANSI-fication support has been removed
9
10Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
112012/05/02
12
13Index: gmp-5.0.4/configure.in
14===================================================================
15--- gmp-5.0.4.orig/configure.in
16+++ gmp-5.0.4/configure.in
17@@ -59,7 +59,7 @@ dnl
18 dnl Note that there's a copy of these options in the top-level Makefile.am,
19 dnl so update there too if changing anything.
20 dnl
21-AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
22+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
23 AM_CONFIG_HEADER(config.h:config.in)
24 AM_MAINTAINER_MODE
25
26@@ -2236,9 +2236,6 @@ fi
27 echo " MPN_PATH=\"$path\""
28
29
30-# Automake ansi2knr support.
31-AM_C_PROTOTYPES
32-
33 CL_AS_NOEXECSTACK
34
35 GMP_PROG_AR
36Index: gmp-5.0.4/Makefile.am
37===================================================================
38--- gmp-5.0.4.orig/Makefile.am
39+++ gmp-5.0.4/Makefile.am
40@@ -25,7 +25,7 @@
41 # Makefiles in subdirectories, but here we must omit it so automake gives
42 # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".
43 #
44-AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
45+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
46
47
48 # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the
diff --git a/meta/recipes-support/gmp/gmp_5.0.5.bb b/meta/recipes-support/gmp/gmp_5.1.0.bb
index d91340ce92..9cb80fee46 100644
--- a/meta/recipes-support/gmp/gmp_5.0.5.bb
+++ b/meta/recipes-support/gmp/gmp_5.1.0.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
5 5
6SRC_URI_append = " file://use-includedir.patch \ 6SRC_URI_append = " file://use-includedir.patch \
7 file://gmp_fix_for_x32.patch \ 7 file://gmp_fix_for_x32.patch \
8 file://gmp_fix_for_automake-1.12.patch \
9 " 8 "
10 9
11SRC_URI[md5sum] = "041487d25e9c230b0c42b106361055fe" 10SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78"
12SRC_URI[sha256sum] = "1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9" 11SRC_URI[sha256sum] = "dfd9aba98fe5caa54a715b4584c7d45eb0ee0c8be9a3181164ad2fad5eefc796"