[oe-commits] Marcin Juszkiewicz : classpath: depend on gmp (for libjavamath) and do not use system one

[git version control]

Module: openembedded.git
Branch: stable/2009
Commit: 011d932ac8abc72dec68bb679738f700d562b34f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=011d932ac8abc72dec68bb679738f700d562b34f

Author: Marcin Juszkiewicz <marcin at buglabs.net>
Date:   Thu Jul  2 05:43:49 2009 +0000

classpath: depend on gmp (for libjavamath) and do not use system one

Signed-off-by: Marcin Juszkiewicz <marcin at buglabs.net>
Acked-by: Koen Kooi <koen at openembedded.org>

---

 recipes/classpath/classpath.inc       |    2 +-
 recipes/classpath/classpath_0.98.bb   |    3 ++-
 recipes/classpath/files/fix-gmp.patch |   19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/recipes/classpath/classpath.inc b/recipes/classpath/classpath.inc
index da3273b..bf630bf 100644
--- a/recipes/classpath/classpath.inc
+++ b/recipes/classpath/classpath.inc
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "Classpath"
 PBN = "classpath"
 
-DEPENDS = "virtual/javac-native fastjar-native zip-native"
+DEPENDS = "virtual/javac-native fastjar-native zip-native gmp"
 RPROVIDES = ""
 
 RDEPENDS_${PN} = "${PBN}-common (>= ${PV})"
diff --git a/recipes/classpath/classpath_0.98.bb b/recipes/classpath/classpath_0.98.bb
index 292c49f..13f7a72 100644
--- a/recipes/classpath/classpath_0.98.bb
+++ b/recipes/classpath/classpath_0.98.bb
@@ -4,9 +4,10 @@ SRC_URI += "\
   file://SimpleName.diff;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://fix-gmp.patch;patch=1 \
   "
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/recipes/classpath/files/fix-gmp.patch b/recipes/classpath/files/fix-gmp.patch
new file mode 100644
index 0000000..3f0dfbe
--- /dev/null
+++ b/recipes/classpath/files/fix-gmp.patch
@@ -0,0 +1,19 @@
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- classpath-0.98.orig/configure.ac
++++ classpath-0.98/configure.ac
+@@ -766,11 +766,11 @@ if test "x${COMPILE_JNI}" = xyes; then
+   dnl __gmpz_mul_si for earlier versions (>= 3.1).
+   dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to
+   dnl change the name of the corresponding ac_ variable on lines 860...
+   if test "x${COMPILE_GMP}" = xyes; then
+     AC_CHECK_LIB(gmp, __gmpz_mul_si,
+-      [GMP_CFLAGS=-I/usr/include
++      [GMP_CFLAGS=
+        GMP_LIBS=-lgmp ],
+       [GMP_CFLAGS=
+        GMP_LIBS= ])
+     AC_SUBST(GMP_CFLAGS)
+     AC_SUBST(GMP_LIBS)