[Pkg-erlang-commits] r1182 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-02-13 10:23:56 +0000 (Sat, 13 Feb 2010)
New Revision: 1182

Added:
   erlang/trunk/debian/patches/java.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/series
Log:
  * Strictened check for JDK 1.5 adding a call to String(int[], int, int)
    because GCJ 4.4 doesn't implement it and OpenJDK isn't available for all
    architectures.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2010-02-07 16:43:24 UTC (rev 1181)
+++ erlang/trunk/debian/changelog	2010-02-13 10:23:56 UTC (rev 1182)
@@ -1,8 +1,10 @@
-erlang (1:13.b.3-dfsg-4) UNRELEASED; urgency=low
+erlang (1:13.b.3-dfsg-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Strictened check for JDK 1.5 adding a call to String(int[], int, int)
+    because GCJ 4.4 doesn't implement it and OpenJDK isn't available for all
+    architectures.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 07 Feb 2010 19:43:03 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 13 Feb 2010 10:28:44 +0300
 
 erlang (1:13.b.3-dfsg-3) unstable; urgency=low
 

Added: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch	                        (rev 0)
+++ erlang/trunk/debian/patches/java.patch	2010-02-13 10:23:56 UTC (rev 1182)
@@ -0,0 +1,31 @@
+Author: Sergei Golovan <sgolovan at debian.org>
+Description: GCJ 4.4 passes the test for JDK 1.5 but doesn't implement
+ String#String(int[], int, int) constructor, which breaks jinterface
+ build. This patch adds a check for the definition of this constructor.
+ It helps to build Erlang on architectures without openjdk-6 available.
+Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
+
+--- erlang-13.b.3-dfsg.orig/erts/configure.in
++++ erlang-13.b.3-dfsg/erts/configure.in
+@@ -3611,7 +3611,8 @@
+   dnl Make sure it's at least JDK 1.5
+   AC_CACHE_CHECK(for JDK version 1.5, 
+      ac_cv_prog_javac_ver_1_5,
+-     [ERL_TRY_LINK_JAVA([], [for (String i : args);],
++     [ERL_TRY_LINK_JAVA([], [for (String i : args);
++        int[] values = {}; String s = new String(values, 0, values.length);],
+         ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
+   if test $ac_cv_prog_javac_ver_1_5 = no; then
+     unset -v JAVAC
+--- erlang-13.b.3-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-13.b.3-dfsg/lib/test_server/src/configure.in
+@@ -399,7 +399,8 @@
+   dnl Make sure it's at least JDK 1.5
+   AC_CACHE_CHECK(for JDK version 1.5, 
+      ac_cv_prog_javac_ver_1_5,
+-     [ERL_TRY_LINK_JAVA([], [for (String i : args);],
++     [ERL_TRY_LINK_JAVA([], [for (String i : args);
++        int[] values = {}; String s = new String(values, 0, values.length);],
+         ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
+   if test $ac_cv_prog_javac_ver_1_5 = no; then
+     unset -v JAVAC

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2010-02-07 16:43:24 UTC (rev 1181)
+++ erlang/trunk/debian/patches/series	2010-02-13 10:23:56 UTC (rev 1182)
@@ -6,5 +6,6 @@
 ssl.patch
 m68k.patch
 docs.patch
+java.patch
 #native.patch
 #build-options.patch