[Pkg-ceph-commits] [ceph] 01/05: New "gcj-jdk.patch" to fix FTBFS with gcj-jdk

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch master
in repository ceph.

commit a3825da
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu May 22 15:35:22 2014

    New "gcj-jdk.patch" to fix FTBFS with gcj-jdk
---
 debian/patches/gcj-jdk.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/gcj.patch     | 13 -------------
 debian/patches/series        |  1 +
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/debian/patches/gcj-jdk.patch b/debian/patches/gcj-jdk.patch
new file mode 100644
index 0000000..bea66b3
--- /dev/null
+++ b/debian/patches/gcj-jdk.patch
@@ -0,0 +1,29 @@
+Last-Update: 2014-05-21
+Author: Gregory Farnum <greg at inktank.com>
+Bug-Ceph: http://tracker.ceph.com/issues/8359
+Description: fix FTBFS with gcj-jdk
+ ~~~~
+    java/native/libcephfs_jni.cc:2878:55: error: invalid conversion from 'const jbyte* {aka const signed char*}' to 'jbyte* {aka signed char*}' [-fpermissive]
+                 reinterpret_cast<const jbyte*>(rawAddress));
+                                                           ^
+    In file included from java/native/libcephfs_jni.cc:27:0:
+    /usr/lib/gcc/x86_64-linux-gnu/4.8/include/jni.h:1471:8: error:   initializing argument 4 of 'void _Jv_JNIEnv::SetByteArrayRegion(jbyteArray, jsize, jsize, jbyte*)' [-fpermissive]
+       void SetByteArrayRegion (jbyteArray val0, jsize val1, jsize val2, jbyte * val3)
+            ^
+    make[5] *** [java/native/libcephfs_jni_la-libcephfs_jni.lo] Error 1
+ ~~~~
+
+--- a/src/java/native/libcephfs_jni.cc
++++ b/src/java/native/libcephfs_jni.cc
+@@ -2874,9 +2874,10 @@
+     if (byteArray.get() == NULL) {
+         return NULL;
+     }
+     env->SetByteArrayRegion(byteArray.get(), 0, addressLength,
+-            reinterpret_cast<const jbyte*>(rawAddress));
++            reinterpret_cast<jbyte*>(const_cast<void*>(rawAddress)));
++
+ 
+     if (ss.ss_family == AF_UNIX) {
+         // Note that we get here for AF_UNIX sockets on accept(2). The unix(7) man page claims
+         // that the peer's sun_path will contain the path, but in practice it doesn't, and the
diff --git a/debian/patches/gcj.patch b/debian/patches/gcj.patch
index 52a9d6f..edf44fe 100644
--- a/debian/patches/gcj.patch
+++ b/debian/patches/gcj.patch
@@ -7,19 +7,6 @@ Description: gcj compatibility, partial fix for FTBFS with "gcj" (i.e. "gcj-jdk"
 
  Changes should not affect OpenJDK which understand '-classpath' as well.
 
- With gcj-jdk we still get FTBFS in "src/client/Trace.cc" later:
-
- ~~~~
-    java/native/libcephfs_jni.cc:2878:55: error: invalid conversion from 'const jbyte* {aka const signed char*}' to 'jbyte* {aka signed char*}' [-fpermissive] 
-                 reinterpret_cast<const jbyte*>(rawAddress)); 
-                                                           ^ 
-    In file included from java/native/libcephfs_jni.cc:27:0: 
-    /usr/lib/gcc/x86_64-linux-gnu/4.8/include/jni.h:1471:8: error:   initializing argument 4 of 'void _Jv_JNIEnv::SetByteArrayRegion(jbyteArray, jsize, jsize, jbyte*)' [-fpermissive] 
-       void SetByteArrayRegion (jbyteArray val0, jsize val1, jsize val2, jbyte * val3) 
-            ^ 
-    make[5] *** [java/native/libcephfs_jni_la-libcephfs_jni.lo] Error 1 
- ~~~~
-
 --- a/m4/ac_prog_javac.m4
 +++ b/m4/ac_prog_javac.m4
 @@ -34,11 +34,11 @@
diff --git a/debian/patches/series b/debian/patches/series
index 24d489c..f3630ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ sleep-recover.patch
 
 ## Debian
 arch.patch
+gcj-jdk.patch
 gcj.patch
 gcj_search_path.patch
 modules.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git