[Pkg-voip-commits] [kamailio] 01/01: java fix

[Victor Seva Lopez]

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

maniac-guest pushed a commit to branch vseva/4.1.0
in repository kamailio.

commit 3d33647312877d43cac1f9b02063a9de7febe494
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Thu Dec 12 08:58:37 2013 +0100

    java fix
---
 debian/control                                     |  2 +-
 ...tect-JAVA_HOME-and-use-proper-libgcj-vers.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  3 ++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index aefbe20..b41f539 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,12 @@ Build-Depends: bison,
  docbook-xml,
  dpkg-dev (>= 1.16.1.1),
  flex,
- gcj-jdk,
  libconfuse-dev,
  libcurl4-gnutls-dev,
  libdb-dev (>= 4.6.19),
  libevent-dev,
  libexpat1-dev,
+ libgcj12-dev,
  libgeoip-dev (>= 1.4.5),
  libhiredis-dev (>= 0.10.0),
  libjson0-dev,
diff --git a/debian/patches/app_java-detect-JAVA_HOME-and-use-proper-libgcj-vers.patch b/debian/patches/app_java-detect-JAVA_HOME-and-use-proper-libgcj-vers.patch
new file mode 100644
index 0000000..55a8465
--- /dev/null
+++ b/debian/patches/app_java-detect-JAVA_HOME-and-use-proper-libgcj-vers.patch
@@ -0,0 +1,33 @@
+From 63a887eac53c7fb3edcd0dcb815f5bb53fa256b4 Mon Sep 17 00:00:00 2001
+From: Victor Seva <linuxmaniac at torreviejawireless.org>
+Date: Thu, 12 Dec 2013 08:53:59 +0100
+Subject: [PATCH] app_java: detect JAVA_HOME and use proper libgcj versioning
+
+---
+ modules/app_java/Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/modules/app_java/Makefile
++++ b/modules/app_java/Makefile
+@@ -15,14 +15,17 @@
+ DEFS += $(shell pkg-config libgcj-4.4 --cflags)
+ LIBS += $(shell pkg-config libgcj-4.4 --cflags) -L$(JVM_PATH) -ljvm
+ else
+-# for now is hard coded, will resolve this later
+-JAVA_HOME ?= /usr/lib/jvm/java-gcj-4.7
+-DEFS += $(shell pkg-config libgcj-4.7 --cflags) -I$(JAVA_HOME)/include
+-LIBS += $(shell pkg-config libgcj-4.7 --libs) -L$(JAVA_HOME)/lib  -ljvm
++# try to detect JAVA_HOME
++JAVA_HOME ?= $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::")
++DEFS += $(shell pkg-config libgcj12 --cflags) -I$(JAVA_HOME)/include
++LIBS += $(shell pkg-config libgcj12 --libs) -L$(JAVA_HOME)/lib  -ljvm
+ 
+ ifeq ($(OS), freebsd)
+ LIBS+=-pthread
+ endif
++ifeq ($(OS), linux)
++DEFS += -I$(JAVA_HOME)/include/linux
++endif
+ endif
+ 
+ # disable optimisation for segfaults debugging
diff --git a/debian/patches/series b/debian/patches/series
index cbc5b70..2cc7737 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ upstream/0007-tm-safety-checks-inside-t_next_contacts.patch
 upstream/0008-registrar-handle-error-case-when-deleting-contact-fa.patch
 upstream/0009-usrloc-avoid-double-locking-when-preloading-attribut.patch
 upstream/0010-core-safety-check-for-double-free-in-q_malloc-as-in-.patch
+app_java-detect-JAVA_HOME-and-use-proper-libgcj-vers.patch
 no_lib64_on_64_bits.patch
 no_INSTALL_file.patch
 fix_export.patch
diff --git a/debian/rules b/debian/rules
index 85e8fb3..6ecd793 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,9 @@ include /usr/share/dpkg/buildflags.mk
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# java stuff using libgcj12
+export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES= 
 

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