upgrade fix for sparc with java present

4 files changed, 122 insertions, 8 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index aeabc4e4d4e0..c8bb95369c86 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gettext
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.31 2004/01/07 20:19:14 weeve Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.32 2004/01/08 15:25:23 gustavoz Exp $
+
+  08 Jan 2004; <gustavoz@gentoo.org> gettext-0.12.1.ebuild:
+  upgrade fix for sparc with java present
 
   07 Jan 2004; Jason Wever <weeve@gentoo.org> gettext-0.12.1.ebuild:
   Marked stable on sparc, resolves #35970 for sparc.
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index f986fd2c2ed0..ba9148ca43ef 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,9 +1,10 @@
-MD5 9195e2947a1a42ed0fe810763a5adebf ChangeLog 4799
-MD5 ec1c0c0630be132c7084ddde6c196e23 gettext-0.11.5-r1.ebuild 1839
+MD5 68a145e938074640c09805feb3bd0362 gettext-0.12.1.ebuild 1880
 MD5 763fc1af245f4f84e158d0bda5345db1 gettext-0.11.5.ebuild 1466
-MD5 40f9e7e12e139a7b57af612206a2487e gettext-0.12.1.ebuild 1727
+MD5 ec1c0c0630be132c7084ddde6c196e23 gettext-0.11.5-r1.ebuild 1839
+MD5 630d6efc6ca0905291dccacf76329eee ChangeLog 4905
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 e846923f9b90ce853b73bfd6756a7cab files/gettext-0.12.1-bootstrap.patch 51612
+MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
 MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5 67
-MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5-r1 67
 MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1 67
-MD5 e846923f9b90ce853b73bfd6756a7cab files/gettext-0.12.1-bootstrap.patch 51612
+MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5-r1 67
diff --git a/sys-devel/gettext/files/gettext-0.12.1-without_java.patch b/sys-devel/gettext/files/gettext-0.12.1-without_java.patch
new file mode 100644
index 000000000000..d60dde9dcbc6
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.12.1-without_java.patch
@@ -0,0 +1,104 @@
+Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
+Date: 2003-11-15
+Initial Package Version: 0.12.1
+Origin: None
+Description: Adds logic to bypass checking for java/gcj. This is useful
+when building gettext in Ch 5 (If java is found on the host, gettext build
+libs that link to the host and also causes failure of some tests during make check).
+To bypass Java checks, pass the option --without-java to configure.
+diff -ur gettext-0.12.1.orig/gettext-runtime/configure gettext-0.12.1/gettext-runtime/configure
+--- gettext-0.12.1.orig/gettext-runtime/configure	2003-05-22 08:38:47.000000000 -0500
++++ gettext-0.12.1/gettext-runtime/configure	2003-10-15 18:20:49.000000000 -0600
+@@ -3268,6 +3268,16 @@
+ 
+ 
+ 
++if test "${with_java+set}" = set; then
++  withval="$with_java"
++  test "$withval" = no || with_java=yes
++else
++  with_java=yes
++fi;
++if test "$with_java" = no ; then
++    echo "Skipping Java compiler checks..."
++else
++
+   echo "$as_me:$LINENO: checking for Java compiler" >&5
+ echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -3490,6 +3500,7 @@
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
++fi
+ 
+ if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+   BUILDJAVA=yes
+diff -ur gettext-0.12.1.orig/gettext-tools/configure gettext-0.12.1/gettext-tools/configure
+--- gettext-0.12.1.orig/gettext-tools/configure	2003-05-22 08:40:24.000000000 -0500
++++ gettext-0.12.1/gettext-tools/configure	2003-10-15 18:21:15.000000000 -0600
+@@ -3070,6 +3070,16 @@
+ 
+ 
+ 
++if test "${with_java+set}" = set; then
++  withval="$with_java"
++  test "$withval" = no || with_java=yes
++else
++  with_java=yes
++fi;
++if test "$with_java" = no ; then
++    echo "Skipping Java native compiler checks..."
++else
++
+   echo "$as_me:$LINENO: checking for Java to native code compiler" >&5
+ echo $ECHO_N "checking for Java to native code compiler... $ECHO_C" >&6
+   # Search for the gcj command or use the one provided by the user.
+@@ -3161,6 +3171,7 @@
+     HAVE_GCJ=
+   fi
+ 
++fi
+ 
+ 
+ 
+@@ -3423,6 +3434,10 @@
+ 
+ 
+ 
++if test "$with_java" = no ; then
++    echo "Skipping Java compiler checks..."
++else
++
+   echo "$as_me:$LINENO: checking for Java compiler" >&5
+ echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -3646,6 +3661,8 @@
+ echo "${ECHO_T}no" >&6
+ fi
+ 
++fi
++
+ if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+   BUILDJAVA=yes
+ else
+@@ -3653,6 +3670,10 @@
+ fi
+ 
+ 
++if test "$with_java" = no ; then
++    echo "Skipping Java VM checks..."
++else
++
+ 
+   echo "$as_me:$LINENO: checking for Java virtual machine" >&5
+ echo $ECHO_N "checking for Java virtual machine... $ECHO_C" >&6
+@@ -3840,7 +3861,7 @@
+ echo "${ECHO_T}$ac_result" >&6
+ 
+ 
+-
++fi
+ 
+ 
+ 
diff --git a/sys-devel/gettext/gettext-0.12.1.ebuild b/sys-devel/gettext/gettext-0.12.1.ebuild
index 3ef40c335e78..c4f6d45d6838 100644
--- a/sys-devel/gettext/gettext-0.12.1.ebuild
+++ b/sys-devel/gettext/gettext-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1.ebuild,v 1.10 2004/01/07 20:19:14 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1.ebuild,v 1.11 2004/01/08 15:25:23 gustavoz Exp $
 
 inherit eutils
 
@@ -35,6 +35,12 @@ src_compile() {
 		unset JAVA_HOME CLASSPATH JDK_HOME JAVAC
 	fi
 
+	# When updating in sparc with java the jvm segfaults
+	if use sparc; then
+		epatch ${FILESDIR}/${P}-without_java.patch
+		myconf="--without-java"
+	fi
+
 	CXX=${CC} econf \
 		--disable-shared \
 		--with-included-gettext \