[Pkg-ceph-commits] [ceph] 02/04: new "gcj_search_path.patch"; mark "gcj.patch" as forwarded.

[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 91ae5d6
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Tue May 13 03:18:10 2014

    new "gcj_search_path.patch"; mark "gcj.patch" as forwarded.
---
 debian/patches/gcj.patch             |  2 +-
 debian/patches/gcj_search_path.patch | 22 ++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/patches/gcj.patch b/debian/patches/gcj.patch
index a553e22..52a9d6f 100644
--- a/debian/patches/gcj.patch
+++ b/debian/patches/gcj.patch
@@ -1,5 +1,5 @@
 Last-Update: 2014-03-25
-Forwarded: no
+Forwarded: https://github.com/ceph/ceph/pull/1803
 Author: Dmitry Smirnov <onlyjob at member.fsf.org>
 Description: gcj compatibility, partial fix for FTBFS with "gcj" (i.e. "gcj-jdk").
  * prioritise use of `javac` executable (gcj provides it through alternatives).
diff --git a/debian/patches/gcj_search_path.patch b/debian/patches/gcj_search_path.patch
new file mode 100644
index 0000000..bd18b7d
--- /dev/null
+++ b/debian/patches/gcj_search_path.patch
@@ -0,0 +1,22 @@
+Last-Update: 2014-05-12
+Forwarded: https://github.com/ceph/ceph/pull/1803
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: look for "jni.h" in gcj-jdk path, fixes FTBFS with gcj-jdk_4.9.0
+~~~~
+  checking for jni.h... no
+  configure: error: Cannot find header 'jni.h'. Try setting --with-jdk-dir
+~~~~
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -391,9 +391,9 @@
+ 
+ 	# setup defaults for Debian default-jdk package (without --with-jdk-dir)
+ 	AS_IF([test -z "$with_jdk_dir"], [
+ 		   # This works with Debian's and CentOS' default-jdk package
+-       for dir in '/usr/lib/jvm/default-java/' '/usr/lib/jvm/java/' ; do
++       for dir in '/usr/lib/jvm/default-java/' '/usr/lib/jvm/java/' '/usr/lib/jvm/java-gcj/'; do
+           # only test if a suitable path has not yet been found
+           AS_IF([test "$EXTRA_JDK_BIN_DIR" == ""], [
+ 		          AS_IF([test -x "$javac_prog"], [
+ 				          EXTRA_JDK_BIN_DIR=`dirname $javac_prog`])
diff --git a/debian/patches/series b/debian/patches/series
index 57e993a..dc715d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ bp0001.patch
 ## Debian
 arch.patch
 gcj.patch
+gcj_search_path.patch
 modules.patch
 sample.ceph.conf.patch
 virtualenv-never-download.patch

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