summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2014-08-12 14:33:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:51 +0100
commit25bf76a8668d2572c6f1a396b657e795b031bbb3 (patch)
tree3476bdf0d087f5a262395730b1f9c7d8a2a66872
parentc23b321b4446685ee4286cc4422772a950ff6370 (diff)
downloadpoky-25bf76a8668d2572c6f1a396b657e795b031bbb3.tar.gz
gmp: uprev it to 6.0.0
Uprev gmp from 5.1.1 to 6.0.0, and remove the 4.2.1 version which is GPLv2, since gmp-6.0.0 is dual-licensing, LGPLv3 or GPLv2; (From OE-Core rev: f181c6ce8b364fbf761a456d998ab78fbd751f35) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-support/gmp/gmp-4.2.1/configure.patch209
-rw-r--r--meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch33
-rw-r--r--meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch48
-rw-r--r--meta/recipes-support/gmp/gmp/append_user_provided_flags.patch (renamed from meta/recipes-support/gmp/gmp-5.1.1/append_user_provided_flags.patch)0
-rw-r--r--meta/recipes-support/gmp/gmp/configure.patch (renamed from meta/recipes-support/gmp/gmp-5.1.1/configure.patch)128
-rw-r--r--meta/recipes-support/gmp/gmp_4.2.1.bb23
-rw-r--r--meta/recipes-support/gmp/gmp_5.1.1.bb11
-rw-r--r--meta/recipes-support/gmp/gmp_6.0.0.bb13
8 files changed, 83 insertions, 382 deletions
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/configure.patch b/meta/recipes-support/gmp/gmp-4.2.1/configure.patch
deleted file mode 100644
index 7597a935a2..0000000000
--- a/meta/recipes-support/gmp/gmp-4.2.1/configure.patch
+++ /dev/null
@@ -1,209 +0,0 @@
1Upstream-Status: Pending
2
3 acinclude.m4 | 26 ++++++++++++++------------
4 configure.in | 24 +++++++++---------------
5 2 files changed, 23 insertions(+), 27 deletions(-)
6
7Index: gmp-5.0.3/acinclude.m4
8===================================================================
9--- gmp-5.0.3.orig/acinclude.m4
10+++ gmp-5.0.3/acinclude.m4
11@@ -30,29 +30,29 @@ dnl a_out.exe - OpenVMS DEC C called
12 dnl conftest.exe - various DOS compilers
13
14
15-define(IA64_PATTERN,
16+define([IA64_PATTERN],
17 [[ia64*-*-* | itanium-*-* | itanium2-*-*]])
18
19 dnl Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all
20 dnl of which config.sub accepts. (Though none of which are likely to work
21 dnl with GMP.)
22 dnl
23-define(M68K_PATTERN,
24+define([M68K_PATTERN],
25 [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]])
26
27-define(POWERPC64_PATTERN,
28+define([POWERPC64_PATTERN],
29 [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]])
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
39-define(X86_PATTERN,
40+define([X86_PATTERN],
41 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
42
43-define(X86_64_PATTERN,
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
49 dnl x86/k6 -> k6
50 dnl x86/k6/mmx -> k6_mmx
51
52-define(GMP_FAT_SUFFIX,
53+define([GMP_FAT_SUFFIX],
54 [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
55
56
57@@ -79,7 +79,7 @@ dnl ----------------------------------
58 dnl Emit code to remove any occurrence of ITEM from $LISTVAR. ITEM can be a
59 dnl shell expression like $foo if desired.
60
61-define(GMP_REMOVE_FROM_LIST,
62+define([GMP_REMOVE_FROM_LIST],
63 [remove_from_list_tmp=
64 for remove_from_list_i in $[][$1]; do
65 if test $remove_from_list_i = [$2]; then :;
66@@ -95,12 +95,12 @@ dnl GMP_STRIP_PATH(subdir)
67 dnl ----------------------
68 dnl Strip entries */subdir from $path and $fat_path.
69
70-define(GMP_STRIP_PATH,
71+define([GMP_STRIP_PATH],
72 [GMP_STRIP_PATH_VAR(path, [$1])
73 GMP_STRIP_PATH_VAR(fat_path, [$1])
74 ])
75
76-define(GMP_STRIP_PATH_VAR,
77+define([GMP_STRIP_PATH_VAR],
78 [tmp_path=
79 for i in $[][$1]; do
80 case $i in
81@@ -121,7 +121,7 @@ dnl
82 dnl Dummy value for GMP_LIMB_BITS is enough
83 dnl for all current configure-time uses of gmp.h.
84
85-define(GMP_INCLUDE_GMP_H,
86+define([GMP_INCLUDE_GMP_H],
87 [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */
88 #define GMP_NAIL_BITS $GMP_NAIL_BITS
89 #define GMP_LIMB_BITS 123
90@@ -136,7 +136,7 @@ dnl Expand at autoconf time to the valu
91 dnl FILE. The regexps here aren't very rugged, but are enough for gmp.
92 dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
93
94-define(GMP_HEADER_GETVAL,
95+define([GMP_HEADER_GETVAL],
96 [patsubst(patsubst(
97 esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
98 [^.*$1[ ]+],[]),
99@@ -150,7 +150,7 @@ dnl The gmp version number, extracted f
100 dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits
101 dnl like 3.0.1 if patchlevel > 0.
102
103-define(GMP_VERSION,
104+define([GMP_VERSION],
105 [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
106 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
107 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
108@@ -1512,7 +1512,9 @@ esac
109 echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
110
111 # All CPUs use asm-defs.m4
112-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
113+echo -n ["include("] >>$gmp_tmpconfigm4i
114+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
115+echo [")"] >>$gmp_tmpconfigm4i
116 ])
117
118
119Index: gmp-5.0.3/configure.in
120===================================================================
121--- gmp-5.0.3.orig/configure.in
122+++ gmp-5.0.3/configure.in
123@@ -29,12 +29,6 @@ AC_REVISION($Revision$)
124 AC_PREREQ(2.59)
125 AC_INIT(GNU MP, GMP_VERSION, [gmp-bugs@gmplib.org, see http://gmplib.org/manual/Reporting-Bugs.html], gmp)
126 AC_CONFIG_SRCDIR(gmp-impl.h)
127-m4_pattern_forbid([^[ \t]*GMP_])
128-m4_pattern_allow(GMP_LDFLAGS)
129-m4_pattern_allow(GMP_LIMB_BITS)
130-m4_pattern_allow(GMP_MPARAM_H_SUGGEST)
131-m4_pattern_allow(GMP_NAIL_BITS)
132-m4_pattern_allow(GMP_NUMB_BITS)
133
134 # If --target is not used then $target_alias is empty, but if say
135 # "./configure athlon-pc-freebsd3.5" is used, then all three of
136@@ -311,7 +305,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1],
137 # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
138 # called. User selections of CC etc are respected.
139 #
140-# Care is taken not to use macros like AC_TRY_COMPILE during the GMP
141+# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP
142 # pre-testing, since they of course depend on AC_PROG_CC, and also some of
143 # them cache their results, which is not wanted.
144 #
145@@ -403,7 +397,7 @@ abilist="standard"
146 # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
147 # c89 over cc here. But note that on HP-UX c89 provides a castrated
148 # environment, and would want to be excluded somehow. Maybe
149-# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and
150+# already does enough to stick cc into ANSI mode and
151 # we don't need to worry.
152 #
153 cclist="gcc cc"
154@@ -1666,7 +1660,7 @@ esac
155 CFLAGS_or_unset=${CFLAGS-'(unset)'}
156 CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
157
158-cat >&AC_FD_CC <<EOF
159+cat >&AS_MESSAGE_LOG_FD() <<EOF
160 User:
161 ABI=$ABI
162 CC=$CC
163@@ -2073,7 +2067,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
164
165 # The C compiler and preprocessor, put into ANSI mode if possible.
166 AC_PROG_CC
167-AC_PROG_CC_STDC
168 AC_PROG_CPP
169 GMP_H_ANSI
170
171@@ -2096,11 +2089,11 @@ AC_SUBST(CCAS)
172
173 # The C++ compiler, if desired.
174 want_cxx=no
175+AC_PROG_CXX
176 if test $enable_cxx != no; then
177 test_CXXFLAGS=${CXXFLAGS+set}
178- AC_PROG_CXX
179
180- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC
181+ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD()
182 cxxflags_ac_prog_cxx=$CXXFLAGS
183 cxxflags_list=ac_prog_cxx
184
185@@ -2206,7 +2199,7 @@ case $host in
186 esac
187
188
189-cat >&AC_FD_CC <<EOF
190+cat >&AS_MESSAGE_LOG_FD() <<EOF
191 Decided:
192 ABI=$ABI
193 CC=$CC
194@@ -3465,7 +3458,7 @@ GMP_FINISH
195 # FIXME: Upcoming version of autoconf/automake may not like broken lines.
196 # Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
197
198-AC_OUTPUT(Makefile \
199+AC_CONFIG_FILES([Makefile \
200 mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \
201 mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \
202 tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \
203@@ -3474,4 +3467,5 @@ AC_OUTPUT(Makefile \
204 tests/cxx/Makefile \
205 doc/Makefile tune/Makefile \
206 demos/Makefile demos/calc/Makefile demos/expr/Makefile \
207- gmp.h:gmp-h.in mp.h:mp-h.in)
208+ gmp.h:gmp-h.in mp.h:mp-h.in])
209+AC_OUTPUT
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
deleted file mode 100644
index aaffaf14c5..0000000000
--- a/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Pending
2
3# "extern inline" in traditional gcc means that the function should be
4# inlined wherever it's seen, while in C99, "extern inline" means that i
5# the function should only be inlined where the inline definition is
6# seen while in other places it's not inlined:
7# http://gcc.gnu.org/ml/gcc/2006-11/msg00006.html
8#
9# gmp checks "--std=gnu99" to use C99 convention however it internally
10# defines some "extern inline" functions in gmp.h, which is included
11# by mainly .c files and finally lead a flood of redefinition function
12# errors when linking objects together.
13#
14# So disable C99/ANSI detection to stick to tranditional gcc behavior
15#
16# by Kevin Tian <kevin.tian@intel.com>, 2010-08-13
17#
18# (this patch is licensed under GPLv2+)
19
20diff --git a/configure.in b/configure.in
21index 450cc92..aab0b59 100644
22--- a/configure.in
23+++ b/configure.in
24@@ -1869,9 +1869,7 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
25
26 # The C compiler and preprocessor, put into ANSI mode if possible.
27 AC_PROG_CC
28-AC_PROG_CC_STDC
29 AC_PROG_CPP
30-GMP_H_ANSI
31
32
33 # The C compiler on the build system, and associated tests.
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch b/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
deleted file mode 100644
index fbd8a39d01..0000000000
--- a/meta/recipes-support/gmp/gmp-4.2.1/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-4.2.1/configure.in
14===================================================================
15--- gmp-4.2.1.orig/configure.in
16+++ gmp-4.2.1/configure.in
17@@ -67,7 +67,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@@ -2022,9 +2022,6 @@ fi
27 echo " MPN_PATH=\"$path\""
28
29
30-# Automake ansi2knr support.
31-AM_C_PROTOTYPES
32-
33 GMP_PROG_AR
34 GMP_PROG_NM
35
36Index: gmp-4.2.1/Makefile.am
37===================================================================
38--- gmp-4.2.1.orig/Makefile.am
39+++ gmp-4.2.1/Makefile.am
40@@ -27,7 +27,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.1.1/append_user_provided_flags.patch b/meta/recipes-support/gmp/gmp/append_user_provided_flags.patch
index ae1386c4c1..ae1386c4c1 100644
--- a/meta/recipes-support/gmp/gmp-5.1.1/append_user_provided_flags.patch
+++ b/meta/recipes-support/gmp/gmp/append_user_provided_flags.patch
diff --git a/meta/recipes-support/gmp/gmp-5.1.1/configure.patch b/meta/recipes-support/gmp/gmp/configure.patch
index 591ea79051..349da3c6b0 100644
--- a/meta/recipes-support/gmp/gmp-5.1.1/configure.patch
+++ b/meta/recipes-support/gmp/gmp/configure.patch
@@ -4,17 +4,23 @@ Updated to apply to gmp-5.1.0
4 4
5Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 5Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
6 6
7diff -Nurd gmp-5.1.0/acinclude.m4 gmp-5.1.0/acinclude.m4 7---
8--- gmp-5.1.0/acinclude.m4 2012-12-18 21:05:09.000000000 +0200 8 acinclude.m4 | 32 +++++++++++++++++---------------
9+++ gmp-5.1.0/acinclude.m4 2013-01-02 05:19:26.977013073 +0200 9 configure.ac | 26 +++++++++-----------------
10@@ -30,29 +30,29 @@ 10 2 files changed, 26 insertions(+), 32 deletions(-)
11
12diff --git a/acinclude.m4 b/acinclude.m4
13index 227712a..199aa6f 100644
14--- a/acinclude.m4
15+++ b/acinclude.m4
16@@ -40,29 +40,29 @@ dnl a_out.exe - OpenVMS DEC C called via GNV wrapper (gnv.sourceforge.net)
11 dnl conftest.exe - various DOS compilers 17 dnl conftest.exe - various DOS compilers
12 18
13 19
14-define(IA64_PATTERN, 20-define(IA64_PATTERN,
15+define([IA64_PATTERN], 21+define([IA64_PATTERN],
16 [[ia64*-*-* | itanium-*-* | itanium2-*-*]]) 22 [[ia64*-*-* | itanium-*-* | itanium2-*-*]])
17 23
18 dnl Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all 24 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 25 dnl of which config.sub accepts. (Though none of which are likely to work
20 dnl with GMP.) 26 dnl with GMP.)
@@ -22,105 +28,106 @@ diff -Nurd gmp-5.1.0/acinclude.m4 gmp-5.1.0/acinclude.m4
22-define(M68K_PATTERN, 28-define(M68K_PATTERN,
23+define([M68K_PATTERN], 29+define([M68K_PATTERN],
24 [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]]) 30 [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]])
25 31
26-define(POWERPC64_PATTERN, 32-define(POWERPC64_PATTERN,
27+define([POWERPC64_PATTERN], 33+define([POWERPC64_PATTERN],
28 [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]]) 34 [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]])
29 35
30-define(S390_PATTERN, 36-define(S390_PATTERN,
31+define([S390_PATTERN], 37+define([S390_PATTERN],
32 [[s390-*-* | z900esa-*-* | z990esa-*-* | z9esa-*-* | z10esa-*-* | z196esa-*-*]]) 38 [[s390-*-* | z900esa-*-* | z990esa-*-* | z9esa-*-* | z10esa-*-* | z196esa-*-*]])
33 39
34-define(S390X_PATTERN, 40-define(S390X_PATTERN,
35+define([S390X_PATTERN], 41+define([S390X_PATTERN],
36 [[s390x-*-* | z900-*-* | z990-*-* | z9-*-* | z10-*-* | z196-*-*]]) 42 [[s390x-*-* | z900-*-* | z990-*-* | z9-*-* | z10-*-* | z196-*-*]])
37 43
38-define(X86_PATTERN, 44-define(X86_PATTERN,
39+define([X86_PATTERN], 45+define([X86_PATTERN],
40 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]]) 46 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
41 47
42-define(X86_64_PATTERN, 48-define(X86_64_PATTERN,
43+define([X86_64_PATTERN], 49+define([X86_64_PATTERN],
44 [[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | bulldozer-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-*]]) 50 [[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | jaguar-*-* | bulldozer-*-* | piledriver-*-* | steamroller-*-* | excavator-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-*]])
45 51
46 dnl GMP_FAT_SUFFIX(DSTVAR, DIRECTORY) 52 dnl GMP_FAT_SUFFIX(DSTVAR, DIRECTORY)
47@@ -70,7 +70,7 @@ 53@@ -80,7 +80,7 @@ dnl x86 -> x86
48 dnl x86/k6 -> k6 54 dnl x86/k6 -> k6
49 dnl x86/k6/mmx -> k6_mmx 55 dnl x86/k6/mmx -> k6_mmx
50 56
51-define(GMP_FAT_SUFFIX, 57-define(GMP_FAT_SUFFIX,
52+define([GMP_FAT_SUFFIX], 58+define([GMP_FAT_SUFFIX],
53 [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]]) 59 [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
54 60
55 61
56@@ -79,7 +79,7 @@ 62@@ -89,7 +89,7 @@ dnl ----------------------------------
57 dnl Emit code to remove any occurrence of ITEM from $LISTVAR. ITEM can be a 63 dnl Emit code to remove any occurrence of ITEM from $LISTVAR. ITEM can be a
58 dnl shell expression like $foo if desired. 64 dnl shell expression like $foo if desired.
59 65
60-define(GMP_REMOVE_FROM_LIST, 66-define(GMP_REMOVE_FROM_LIST,
61+define([GMP_REMOVE_FROM_LIST], 67+define([GMP_REMOVE_FROM_LIST],
62 [remove_from_list_tmp= 68 [remove_from_list_tmp=
63 for remove_from_list_i in $[][$1]; do 69 for remove_from_list_i in $[][$1]; do
64 if test $remove_from_list_i = [$2]; then :; 70 if test $remove_from_list_i = [$2]; then :;
65@@ -95,12 +95,12 @@ 71@@ -105,12 +105,12 @@ dnl GMP_STRIP_PATH(subdir)
66 dnl ---------------------- 72 dnl ----------------------
67 dnl Strip entries */subdir from $path and $fat_path. 73 dnl Strip entries */subdir from $path and $fat_path.
68 74
69-define(GMP_STRIP_PATH, 75-define(GMP_STRIP_PATH,
70+define([GMP_STRIP_PATH], 76+define([GMP_STRIP_PATH],
71 [GMP_STRIP_PATH_VAR(path, [$1]) 77 [GMP_STRIP_PATH_VAR(path, [$1])
72 GMP_STRIP_PATH_VAR(fat_path, [$1]) 78 GMP_STRIP_PATH_VAR(fat_path, [$1])
73 ]) 79 ])
74 80
75-define(GMP_STRIP_PATH_VAR, 81-define(GMP_STRIP_PATH_VAR,
76+define([GMP_STRIP_PATH_VAR], 82+define([GMP_STRIP_PATH_VAR],
77 [tmp_path= 83 [tmp_path=
78 for i in $[][$1]; do 84 for i in $[][$1]; do
79 case $i in 85 case $i in
80@@ -121,7 +121,7 @@ 86@@ -131,7 +131,7 @@ dnl
81 dnl Dummy value for GMP_LIMB_BITS is enough 87 dnl Dummy value for GMP_LIMB_BITS is enough
82 dnl for all current configure-time uses of gmp.h. 88 dnl for all current configure-time uses of gmp.h.
83 89
84-define(GMP_INCLUDE_GMP_H, 90-define(GMP_INCLUDE_GMP_H,
85+define([GMP_INCLUDE_GMP_H], 91+define([GMP_INCLUDE_GMP_H],
86 [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ 92 [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */
87 #define GMP_NAIL_BITS $GMP_NAIL_BITS 93 #define GMP_NAIL_BITS $GMP_NAIL_BITS
88 #define GMP_LIMB_BITS 123 94 #define GMP_LIMB_BITS 123
89@@ -136,7 +136,7 @@ 95@@ -146,7 +146,7 @@ dnl Expand at autoconf time to the value of a "#define NAME" from the given
90 dnl FILE. The regexps here aren't very rugged, but are enough for gmp. 96 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. 97 dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
92 98
93-define(GMP_HEADER_GETVAL, 99-define(GMP_HEADER_GETVAL,
94+define([GMP_HEADER_GETVAL], 100+define([GMP_HEADER_GETVAL],
95 [patsubst(patsubst( 101 [patsubst(patsubst(
96 esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]), 102 esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
97 [^.*$1[ ]+],[]), 103 [^.*$1[ ]+],[]),
98@@ -150,7 +150,7 @@ 104@@ -160,7 +160,7 @@ dnl The gmp version number, extracted from the #defines in gmp-h.in at
99 dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits 105 dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits
100 dnl like 3.0.1 if patchlevel > 0. 106 dnl like 3.0.1 if patchlevel > 0.
101 107
102-define(GMP_VERSION, 108-define(GMP_VERSION,
103+define([GMP_VERSION], 109+define([GMP_VERSION],
104 [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl 110 [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
105 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl 111 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
106 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)]) 112 .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
107@@ -1512,7 +1512,9 @@ 113@@ -1524,7 +1524,9 @@ esac
108 echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4 114 echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
109 115
110 # All CPUs use asm-defs.m4 116 # All CPUs use asm-defs.m4
111-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i 117-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
112+echo -n ["include("] >>$gmp_tmpconfigm4i 118+echo -n ["include("] >>$gmp_tmpconfigm4i
113+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i 119+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
114+echo [")"] >>$gmp_tmpconfigm4i 120+echo [")"] >>$gmp_tmpconfigm4i
115 ]) 121 ])
116 122
117 123
118diff -Nurd gmp-5.1.0/configure.ac gmp-5.1.0/configure.ac 124diff --git a/configure.ac b/configure.ac
119--- gmp-5.1.0/configure.ac 2012-12-18 21:05:09.000000000 +0200 125index 64b2c50..f07b821 100644
120+++ gmp-5.1.0/configure.ac 2013-01-02 05:19:26.977013073 +0200 126--- a/configure.ac
121@@ -29,13 +29,6 @@ 127+++ b/configure.ac
128@@ -39,14 +39,6 @@ AC_REVISION($Revision$)
122 AC_PREREQ(2.59) 129 AC_PREREQ(2.59)
123 AC_INIT(GNU MP, GMP_VERSION, [gmp-bugs@gmplib.org, see http://gmplib.org/manual/Reporting-Bugs.html], gmp) 130 AC_INIT(GNU MP, GMP_VERSION, [gmp-bugs@gmplib.org, see https://gmplib.org/manual/Reporting-Bugs.html], gmp)
124 AC_CONFIG_SRCDIR(gmp-impl.h) 131 AC_CONFIG_SRCDIR(gmp-impl.h)
125-m4_pattern_forbid([^[ \t]*GMP_]) 132-m4_pattern_forbid([^[ \t]*GMP_])
126-m4_pattern_allow(GMP_LDFLAGS) 133-m4_pattern_allow(GMP_LDFLAGS)
@@ -129,10 +136,11 @@ diff -Nurd gmp-5.1.0/configure.ac gmp-5.1.0/configure.ac
129-m4_pattern_allow(GMP_NAIL_BITS) 136-m4_pattern_allow(GMP_NAIL_BITS)
130-m4_pattern_allow(GMP_NUMB_BITS) 137-m4_pattern_allow(GMP_NUMB_BITS)
131-m4_pattern_allow(GMP_NONSTD_ABI) 138-m4_pattern_allow(GMP_NONSTD_ABI)
132 139-m4_pattern_allow(GMP_CPU_TYPE)
140
133 # If --target is not used then $target_alias is empty, but if say 141 # 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 142 # "./configure athlon-pc-freebsd3.5" is used, then all three of
135@@ -314,7 +307,7 @@ 143@@ -348,7 +340,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1],
136 # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is 144 # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
137 # called. User selections of CC etc are respected. 145 # called. User selections of CC etc are respected.
138 # 146 #
@@ -141,7 +149,7 @@ diff -Nurd gmp-5.1.0/configure.ac gmp-5.1.0/configure.ac
141 # pre-testing, since they of course depend on AC_PROG_CC, and also some of 149 # pre-testing, since they of course depend on AC_PROG_CC, and also some of
142 # them cache their results, which is not wanted. 150 # them cache their results, which is not wanted.
143 # 151 #
144@@ -406,7 +399,7 @@ 152@@ -440,7 +432,7 @@ abilist="standard"
145 # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring 153 # 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 154 # c89 over cc here. But note that on HP-UX c89 provides a castrated
147 # environment, and would want to be excluded somehow. Maybe 155 # environment, and would want to be excluded somehow. Maybe
@@ -150,61 +158,65 @@ diff -Nurd gmp-5.1.0/configure.ac gmp-5.1.0/configure.ac
150 # we don't need to worry. 158 # we don't need to worry.
151 # 159 #
152 cclist="gcc cc" 160 cclist="gcc cc"
153@@ -1727,7 +1720,7 @@ 161@@ -1843,7 +1835,7 @@ esac
154 CFLAGS_or_unset=${CFLAGS-'(unset)'} 162 CFLAGS_or_unset=${CFLAGS-'(unset)'}
155 CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} 163 CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
156 164
157-cat >&AC_FD_CC <<EOF 165-cat >&AC_FD_CC <<EOF
158+cat >&AS_MESSAGE_LOG_FD() <<EOF 166+cat >&AS_MESSAGE_LOG_FD() <<EOF
159 User: 167 User:
160 ABI=$ABI 168 ABI=$ABI
161 CC=$CC 169 CC=$CC
162@@ -2147,7 +2140,6 @@ 170@@ -2264,7 +2256,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
163 171
164 # The C compiler and preprocessor, put into ANSI mode if possible. 172 # The C compiler and preprocessor, put into ANSI mode if possible.
165 AC_PROG_CC 173 AC_PROG_CC
166-AC_PROG_CC_STDC 174-AC_PROG_CC_STDC
167 AC_PROG_CPP 175 AC_PROG_CPP
168 176
169 177
170@@ -2169,11 +2161,11 @@ 178@@ -2286,11 +2277,11 @@ AC_SUBST(CCAS)
171 179
172 # The C++ compiler, if desired. 180 # The C++ compiler, if desired.
173 want_cxx=no 181 want_cxx=no
174+AC_PROG_CXX 182+AC_PROG_CXX
175 if test $enable_cxx != no; then 183 if test $enable_cxx != no; then
176 test_CXXFLAGS=${CXXFLAGS+set} 184 test_CXXFLAGS=${CXXFLAGS+set}
177- AC_PROG_CXX 185- AC_PROG_CXX
178 186
179- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC 187- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC
180+ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD() 188+ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD()
181 cxxflags_ac_prog_cxx=$CXXFLAGS 189 cxxflags_ac_prog_cxx=$CXXFLAGS
182 cxxflags_list=ac_prog_cxx 190 cxxflags_list=ac_prog_cxx
183 191
184@@ -2289,7 +2281,7 @@ 192@@ -2412,7 +2403,7 @@ if test "$enable_assembly" = "no"; then
185 fi 193 fi
186 194
187 195
188-cat >&AC_FD_CC <<EOF 196-cat >&AC_FD_CC <<EOF
189+cat >&AS_MESSAGE_LOG_FD() <<EOF 197+cat >&AS_MESSAGE_LOG_FD() <<EOF
190 Decided: 198 Decided:
191 ABI=$ABI 199 ABI=$ABI
192 CC=$CC 200 CC=$CC
193@@ -3638,7 +3630,7 @@ 201@@ -3781,7 +3772,7 @@ GMP_FINISH
194 # FIXME: Upcoming version of autoconf/automake may not like broken lines. 202 # FIXME: Upcoming version of autoconf/automake may not like broken lines.
195 # Right now automake isn't accepting the new AC_CONFIG_FILES scheme. 203 # Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
196 204
197-AC_OUTPUT(Makefile \ 205-AC_OUTPUT(Makefile \
198+AC_CONFIG_FILES([Makefile \ 206+AC_CONFIG_FILES([Makefile \
199 mpf/Makefile mpn/Makefile mpq/Makefile \ 207 mpf/Makefile mpn/Makefile mpq/Makefile \
200 mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile \ 208 mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile \
201 tests/Makefile tests/devel/Makefile \ 209 tests/Makefile tests/devel/Makefile \
202@@ -3647,7 +3639,8 @@ 210@@ -3790,7 +3781,8 @@ AC_OUTPUT(Makefile \
203 tests/cxx/Makefile \ 211 tests/cxx/Makefile \
204 doc/Makefile tune/Makefile \ 212 doc/Makefile tune/Makefile \
205 demos/Makefile demos/calc/Makefile demos/expr/Makefile \ 213 demos/Makefile demos/calc/Makefile demos/expr/Makefile \
206- gmp.h:gmp-h.in) 214- gmp.h:gmp-h.in)
207+ gmp.h:gmp-h.in]) 215+ gmp.h:gmp-h.in])
208+AC_OUTPUT 216+AC_OUTPUT
209 217
210 AC_MSG_NOTICE([summary of build options: 218 AC_MSG_NOTICE([summary of build options:
219
220--
2211.9.1
222
diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb b/meta/recipes-support/gmp/gmp_4.2.1.bb
deleted file mode 100644
index 69ad0ca670..0000000000
--- a/meta/recipes-support/gmp/gmp_4.2.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1SUMMARY = "GNU multiprecision arithmetic library"
2DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers"
3HOMEPAGE = "http://gmplib.org/"
4BUGTRACKER = "http://gmplib.org/mailman/listinfo/gmp-bugs"
5# demo is licensed under GPLv2+, which however we don't package at all
6LICENSE = "LGPLv2.1+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \
8 file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
9 file://gmp-h.in;beginline=6;endline=21;md5=e056f74a12c3277d730dbcfb85d2ca34"
10PR = "r2"
11
12SRC_URI = "${GNU_MIRROR}/gmp/${BP}.tar.bz2 \
13 file://disable-stdc.patch \
14 file://gmp_fix_for_automake-1.12.patch \
15 "
16
17SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3"
18SRC_URI[sha256sum] = "d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941"
19
20PACKAGECONFIG ??= ""
21PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline"
22
23inherit autotools texinfo
diff --git a/meta/recipes-support/gmp/gmp_5.1.1.bb b/meta/recipes-support/gmp/gmp_5.1.1.bb
deleted file mode 100644
index 602061096a..0000000000
--- a/meta/recipes-support/gmp/gmp_5.1.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require gmp.inc
2LICENSE="LGPLv3&GPLv3"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
5
6SRC_URI_append = " file://use-includedir.patch \
7 file://append_user_provided_flags.patch \
8 "
9
10SRC_URI[md5sum] = "2fa018a7cd193c78494525f236d02dd6"
11SRC_URI[sha256sum] = "a0d4779f48b36519dfaceb5f987a7c76fcac223258bebea3bb2244310970afad"
diff --git a/meta/recipes-support/gmp/gmp_6.0.0.bb b/meta/recipes-support/gmp/gmp_6.0.0.bb
new file mode 100644
index 0000000000..19e5f4dd19
--- /dev/null
+++ b/meta/recipes-support/gmp/gmp_6.0.0.bb
@@ -0,0 +1,13 @@
1require gmp.inc
2LICENSE="GPLv2 | LGPLv3"
3REVISION="a"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
5 file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
6 file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7"
8SRC_URI_append = " file://use-includedir.patch \
9 file://append_user_provided_flags.patch \
10"
11
12SRC_URI[md5sum] = "b7ff2d88cae7f8085bd5006096eed470"
13SRC_URI[sha256sum] = "7f8e9a804b9c6d07164cf754207be838ece1219425d64e28cfa3e70d5c759aaf"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-04 21:42:20 +0000