Browse Source

pkg/kamailio/deb: set JAVA_HOME and use libgcj12-dev instead of gcj-jdk

Victor Seva 11 năm trước cách đây
mục cha
commit
ded4959bf1

+ 1 - 1
pkg/kamailio/deb/debian/control

@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Jon Bonilla <[email protected]>
 Build-Depends: bison,
                debhelper (>= 5),
-               gcj-jdk,
                docbook-xml,
                dpatch,
                dpkg-dev (>= 1.13.19),
@@ -14,6 +13,7 @@ Build-Depends: bison,
                libdb-dev (>= 4.6.19),
                libevent-dev,
                libexpat1-dev,
+               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson0-dev,

+ 3 - 0
pkg/kamailio/deb/debian/rules

@@ -18,6 +18,9 @@
 #  -- already set in compat
 export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) debug"
 
+# java stuff using libgcj12
+export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES= 
 

+ 1 - 1
pkg/kamailio/deb/jessie/control

@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Jon Bonilla <[email protected]>
 Build-Depends: bison,
                debhelper (>= 5),
-               gcj-jdk,
                docbook-xml,
                dpatch,
                dpkg-dev (>= 1.13.19),
@@ -14,6 +13,7 @@ Build-Depends: bison,
                libdb-dev (>= 4.6.19),
                libevent-dev,
                libexpat1-dev,
+               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson0-dev,

+ 3 - 0
pkg/kamailio/deb/jessie/rules

@@ -18,6 +18,9 @@
 #  -- already set in compat
 export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) debug"
 
+# java stuff using libgcj12
+export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES= 
 

+ 1 - 1
pkg/kamailio/deb/wheezy/control

@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Jon Bonilla <[email protected]>
 Build-Depends: bison,
                debhelper (>= 5),
-               gcj-jdk,
                docbook-xml,
                dpatch,
                dpkg-dev (>= 1.13.19),
@@ -14,6 +13,7 @@ Build-Depends: bison,
                libdb-dev (>= 4.6.19),
                libevent-dev,
                libexpat1-dev,
+               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson0-dev,

+ 3 - 0
pkg/kamailio/deb/wheezy/rules

@@ -18,6 +18,9 @@
 #  -- already set in compat
 export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) debug"
 
+# java stuff using libgcj12
+export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=