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 @@
  configure.in |   24 +++++++++---------------
  2 files changed, 23 insertions(+), 27 deletions(-)
 
-Index: gmp-4.2.2/acinclude.m4
+Index: gmp-4.2.4/acinclude.m4
 ===================================================================
---- gmp-4.2.2.orig/acinclude.m4 2007-09-01 11:09:03.000000000 +0100
-+++ gmp-4.2.2/acinclude.m4      2008-04-30 17:19:16.000000000 +0100
+--- gmp-4.2.4.orig/acinclude.m4 2008-09-05 14:21:12.000000000 +0200
++++ gmp-4.2.4/acinclude.m4      2008-10-15 23:37:38.062976613 +0200
 @@ -30,20 +30,20 @@
  dnl    conftest.exe - various DOS compilers
  
@@ -28,7 +28,7 @@ Index: gmp-4.2.2/acinclude.m4
  
 -define(X86_PATTERN,
 +define([X86_PATTERN],
- [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-*]])
+ [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-*]])
  
  
 @@ -62,7 +62,7 @@
@@ -51,7 +51,7 @@ Index: gmp-4.2.2/acinclude.m4
    if test $remove_from_list_i = [$2]; then :;
 @@ -87,12 +87,12 @@
  dnl  ----------------------
- dnl  Strip entries subdir from $path and $fat_path.
+ dnl  Strip entries */subdir from $path and $fat_path.
  
 -define(GMP_STRIP_PATH,
 +define([GMP_STRIP_PATH],
@@ -91,7 +91,7 @@ Index: gmp-4.2.2/acinclude.m4
  [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
  .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
  ifelse(m4_eval(GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in) > 0),1,
-@@ -1489,7 +1489,9 @@
+@@ -1506,7 +1506,9 @@
  echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
  
  # All CPUs use asm-defs.m4
@@ -102,10 +102,10 @@ Index: gmp-4.2.2/acinclude.m4
  ])
  
  
-Index: gmp-4.2.2/configure.in
+Index: gmp-4.2.4/configure.in
 ===================================================================
---- gmp-4.2.2.orig/configure.in 2007-09-09 17:39:14.000000000 +0100
-+++ gmp-4.2.2/configure.in      2008-04-30 17:09:10.000000000 +0100
+--- gmp-4.2.4.orig/configure.in 2008-08-01 19:24:04.000000000 +0200
++++ gmp-4.2.4/configure.in      2008-10-15 23:35:03.466325346 +0200
 @@ -29,12 +29,6 @@
  AC_PREREQ(2.59)
  AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@swox.com, gmp)
@@ -119,7 +119,7 @@ Index: gmp-4.2.2/configure.in
  
  # If --target is not used then $target_alias is empty, but if say
  # "./configure athlon-pc-freebsd3.5" is used, then all three of
-@@ -275,7 +269,7 @@
+@@ -278,7 +272,7 @@
  # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
  # called.  User selections of CC etc are respected.
  #
@@ -128,7 +128,7 @@ Index: gmp-4.2.2/configure.in
  # pre-testing, since they of course depend on AC_PROG_CC, and also some of
  # them cache their results, which is not wanted.
  #
-@@ -367,7 +361,7 @@
+@@ -370,7 +364,7 @@
  # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
  # c89 over cc here.  But note that on HP-UX c89 provides a castrated
  # environment, and would want to be excluded somehow.  Maybe
@@ -137,7 +137,7 @@ Index: gmp-4.2.2/configure.in
  # we don't need to worry.
  #
  cclist="gcc cc"
-@@ -1518,7 +1512,7 @@
+@@ -1525,7 +1519,7 @@
  CFLAGS_or_unset=${CFLAGS-'(unset)'}
  CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
  
@@ -146,7 +146,7 @@ Index: gmp-4.2.2/configure.in
  User:
  ABI=$ABI
  CC=$CC
-@@ -1889,7 +1883,6 @@
+@@ -1896,7 +1890,6 @@
  
  # The C compiler and preprocessor, put into ANSI mode if possible.
  AC_PROG_CC
@@ -154,7 +154,7 @@ Index: gmp-4.2.2/configure.in
  AC_PROG_CPP
  GMP_H_ANSI
  
-@@ -1912,11 +1905,11 @@
+@@ -1919,11 +1912,11 @@
  
  # The C++ compiler, if desired.
  want_cxx=no
@@ -168,7 +168,7 @@ Index: gmp-4.2.2/configure.in
    cxxflags_ac_prog_cxx=$CXXFLAGS
    cxxflags_list=ac_prog_cxx
  
-@@ -2022,7 +2015,7 @@
+@@ -2029,7 +2022,7 @@
  esac
  
  
@@ -177,7 +177,7 @@ Index: gmp-4.2.2/configure.in
  Decided:
  ABI=$ABI
  CC=$CC
-@@ -3199,7 +3192,7 @@
+@@ -3208,7 +3201,7 @@
  # FIXME: Upcoming version of autoconf/automake may not like broken lines.
  #        Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
  
@@ -186,7 +186,7 @@ Index: gmp-4.2.2/configure.in
    mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile                        \
    mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile             \
    tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile             \
-@@ -3208,4 +3201,5 @@
+@@ -3217,4 +3210,5 @@
    tests/cxx/Makefile                                                   \
    doc/Makefile tune/Makefile                                           \
    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 @@
+Index: gmp-4.2.4/Makefile.am
+===================================================================
+--- gmp-4.2.4.orig/Makefile.am  2008-09-10 19:31:27.000000000 +0000
++++ gmp-4.2.4/Makefile.am       2009-07-06 20:19:19.000000000 +0000
+@@ -106,7 +106,7 @@
+ # but anyone knowledgable enough to be playing with exec_prefix will be able
+ # to address that.
+ #
+-includeexecdir = $(exec_prefix)/include
++includeexecdir = $(includedir)
+ include_HEADERS = $(GMPXX_HEADERS_OPTION)
+ nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION)
+ 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 @@
-PV = "4.2.2"
+PV = "4.2.4"
 require gmp-native.inc
+PR = "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 @@
-PV = "4.2.2"
+PV = "4.2.4"
 require 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 @@
-require gmp.inc
-
-SRC_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 @@
+PR = "r0"
+
+SRC_URI_append += "file://sh4-asmfix.patch;patch=1 \
+                   file://use-includedir.patch;patch=1 \
+                  "
+require gmp.inc
+LICENSE = "GPLv3 LGPLv3"