summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-07-31 12:03:58 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-07-31 12:03:58 +0100
commite2182c5b04c8cb4479f921bb7e204c8f2fcb0ae9 (patch)
treeef39386ff4bcef8883f0d3dc0b68ffd671c68443
parentaa5cf6c518ae6ce6000e62f43c44dd30f8c5b117 (diff)
downloadpoky-e2182c5b04c8cb4479f921bb7e204c8f2fcb0ae9.tar.gz
gmp: 4.2.2 -> 4.2.4 (parts from OE.dev)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/gmp/gmp-4.2.4/amd64.patch (renamed from meta/packages/gmp/gmp-4.2.2/amd64.patch)0
-rw-r--r--meta/packages/gmp/gmp-4.2.4/configure.patch (renamed from meta/packages/gmp/gmp-4.2.2/configure.patch)34
-rw-r--r--meta/packages/gmp/gmp-4.2.4/sh4-asmfix.patch (renamed from meta/packages/gmp/gmp-4.2.2/sh4-asmfix.patch)0
-rw-r--r--meta/packages/gmp/gmp-4.2.4/use-includedir.patch13
-rw-r--r--meta/packages/gmp/gmp-native_4.2.4.bb (renamed from meta/packages/gmp/gmp-native_4.2.2.bb)3
-rw-r--r--meta/packages/gmp/gmp-sdk_4.2.4.bb (renamed from meta/packages/gmp/gmp-sdk_4.2.2.bb)2
-rw-r--r--meta/packages/gmp/gmp_4.2.2.bb3
-rw-r--r--meta/packages/gmp/gmp_4.2.4.bb7
8 files changed, 40 insertions, 22 deletions
diff --git a/meta/packages/gmp/gmp-4.2.2/amd64.patch b/meta/packages/gmp/gmp-4.2.4/amd64.patch
index 67be9dd350..67be9dd350 100644
--- a/meta/packages/gmp/gmp-4.2.2/amd64.patch
+++ b/meta/packages/gmp/gmp-4.2.4/amd64.patch
diff --git a/meta/packages/gmp/gmp-4.2.2/configure.patch b/meta/packages/gmp/gmp-4.2.4/configure.patch
index b563bd0586..8056953230 100644
--- a/meta/packages/gmp/gmp-4.2.2/configure.patch
+++ b/meta/packages/gmp/gmp-4.2.4/configure.patch
@@ -2,10 +2,10 @@
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.2/acinclude.m4 5Index: gmp-4.2.4/acinclude.m4
6=================================================================== 6===================================================================
7--- gmp-4.2.2.orig/acinclude.m4 2007-09-01 11:09:03.000000000 +0100 7--- gmp-4.2.4.orig/acinclude.m4 2008-09-05 14:21:12.000000000 +0200
8+++ gmp-4.2.2/acinclude.m4 2008-04-30 17:19:16.000000000 +0100 8+++ gmp-4.2.4/acinclude.m4 2008-10-15 23:37:38.062976613 +0200
9@@ -30,20 +30,20 @@ 9@@ -30,20 +30,20 @@
10 dnl conftest.exe - various DOS compilers 10 dnl conftest.exe - various DOS compilers
11 11
@@ -28,7 +28,7 @@ Index: gmp-4.2.2/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*-*-*]]) 31 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-*]])
32 32
33 33
34@@ -62,7 +62,7 @@ 34@@ -62,7 +62,7 @@
@@ -51,7 +51,7 @@ Index: gmp-4.2.2/acinclude.m4
51 if test $remove_from_list_i = [$2]; then :; 51 if test $remove_from_list_i = [$2]; then :;
52@@ -87,12 +87,12 @@ 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],
@@ -91,7 +91,7 @@ Index: gmp-4.2.2/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@@ -1489,7 +1489,9 @@ 94@@ -1506,7 +1506,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
@@ -102,10 +102,10 @@ Index: gmp-4.2.2/acinclude.m4
102 ]) 102 ])
103 103
104 104
105Index: gmp-4.2.2/configure.in 105Index: gmp-4.2.4/configure.in
106=================================================================== 106===================================================================
107--- gmp-4.2.2.orig/configure.in 2007-09-09 17:39:14.000000000 +0100 107--- gmp-4.2.4.orig/configure.in 2008-08-01 19:24:04.000000000 +0200
108+++ gmp-4.2.2/configure.in 2008-04-30 17:09:10.000000000 +0100 108+++ gmp-4.2.4/configure.in 2008-10-15 23:35:03.466325346 +0200
109@@ -29,12 +29,6 @@ 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)
@@ -119,7 +119,7 @@ Index: gmp-4.2.2/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@@ -275,7 +269,7 @@ 122@@ -278,7 +272,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.2/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@@ -367,7 +361,7 @@ 131@@ -370,7 +364,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.2/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@@ -1518,7 +1512,7 @@ 140@@ -1525,7 +1519,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.2/configure.in
146 User: 146 User:
147 ABI=$ABI 147 ABI=$ABI
148 CC=$CC 148 CC=$CC
149@@ -1889,7 +1883,6 @@ 149@@ -1896,7 +1890,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.2/configure.in
154 AC_PROG_CPP 154 AC_PROG_CPP
155 GMP_H_ANSI 155 GMP_H_ANSI
156 156
157@@ -1912,11 +1905,11 @@ 157@@ -1919,11 +1912,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.2/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@@ -2022,7 +2015,7 @@ 171@@ -2029,7 +2022,7 @@
172 esac 172 esac
173 173
174 174
@@ -177,7 +177,7 @@ Index: gmp-4.2.2/configure.in
177 Decided: 177 Decided:
178 ABI=$ABI 178 ABI=$ABI
179 CC=$CC 179 CC=$CC
180@@ -3199,7 +3192,7 @@ 180@@ -3208,7 +3201,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.2/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@@ -3208,4 +3201,5 @@ 189@@ -3217,4 +3210,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.2/sh4-asmfix.patch b/meta/packages/gmp/gmp-4.2.4/sh4-asmfix.patch
index 1a01f61533..1a01f61533 100644
--- a/meta/packages/gmp/gmp-4.2.2/sh4-asmfix.patch
+++ b/meta/packages/gmp/gmp-4.2.4/sh4-asmfix.patch
diff --git a/meta/packages/gmp/gmp-4.2.4/use-includedir.patch b/meta/packages/gmp/gmp-4.2.4/use-includedir.patch
new file mode 100644
index 0000000000..ee3891f807
--- /dev/null
+++ b/meta/packages/gmp/gmp-4.2.4/use-includedir.patch
@@ -0,0 +1,13 @@
1Index: gmp-4.2.4/Makefile.am
2===================================================================
3--- gmp-4.2.4.orig/Makefile.am 2008-09-10 19:31:27.000000000 +0000
4+++ gmp-4.2.4/Makefile.am 2009-07-06 20:19:19.000000000 +0000
5@@ -106,7 +106,7 @@
6 # but anyone knowledgable enough to be playing with exec_prefix will be able
7 # to address that.
8 #
9-includeexecdir = $(exec_prefix)/include
10+includeexecdir = $(includedir)
11 include_HEADERS = $(GMPXX_HEADERS_OPTION)
12 nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION)
13 lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION)
diff --git a/meta/packages/gmp/gmp-native_4.2.2.bb b/meta/packages/gmp/gmp-native_4.2.4.bb
index af85db61f2..96e440756c 100644
--- a/meta/packages/gmp/gmp-native_4.2.2.bb
+++ b/meta/packages/gmp/gmp-native_4.2.4.bb
@@ -1,2 +1,3 @@
1PV = "4.2.2" 1PV = "4.2.4"
2require gmp-native.inc 2require gmp-native.inc
3PR = "r0"
diff --git a/meta/packages/gmp/gmp-sdk_4.2.2.bb b/meta/packages/gmp/gmp-sdk_4.2.4.bb
index 286f800fd7..d1d182982a 100644
--- a/meta/packages/gmp/gmp-sdk_4.2.2.bb
+++ b/meta/packages/gmp/gmp-sdk_4.2.4.bb
@@ -1,2 +1,2 @@
1PV = "4.2.2" 1PV = "4.2.4"
2require gmp-sdk.inc 2require gmp-sdk.inc
diff --git a/meta/packages/gmp/gmp_4.2.2.bb b/meta/packages/gmp/gmp_4.2.2.bb
deleted file mode 100644
index 6af2db66a4..0000000000
--- a/meta/packages/gmp/gmp_4.2.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require gmp.inc
2
3SRC_URI += "file://sh4-asmfix.patch;patch=1" \ No newline at end of file
diff --git a/meta/packages/gmp/gmp_4.2.4.bb b/meta/packages/gmp/gmp_4.2.4.bb
new file mode 100644
index 0000000000..33f8ea287a
--- /dev/null
+++ b/meta/packages/gmp/gmp_4.2.4.bb
@@ -0,0 +1,7 @@
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"