Changeset 809 for trunk

Timestamp:

Jan 23, 2017, 9:44:49 AM (8 years ago)

Author:

djay

Message:

Add the java-rpath to the configure options.

Location:

trunk

Files:

• docs/install/installation.rst (modified) (1 diff)
• zoo-project/zoo-kernel/configure.ac (modified) (2 diffs)

trunk/docs/install/installation.rst

@@ -343 +343 @@
 file.
 
+.. note:: 
+   You can use the `--with-java-rpath` option to produce a binary
+   aware of the libjvm location.
+
 
 .. note:: 

trunk/zoo-project/zoo-kernel/configure.ac

@@ -595 +595 @@
         [JDKHOME="$withval"; JAVA_ENABLED="-DUSE_JAVA"], [JAVA_ENABLED=""])
 
+AC_ARG_WITH([java-rpath], 
+        [AS_HELP_STRING([--with-java-rpath=yes], [To set rpath for java support, disabled by default])], 
+        [JAVA_RPATH="$withval"], [JAVA_RPATH=""])
+
 if test -z "$JAVA_ENABLED"
 then
@@ -621 +625 @@
                         JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/server/ -ljvm -lpthread"
                         JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+                        if test x$JAVA_RPATH = "xyes"; then
+                           JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/i386/server/"
+                        fi
                 else
                         if test -d "$JDKHOME/jre/lib/amd64"; then
                            JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/server/ -ljvm -lpthread"
                            JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+                           if test x$JAVA_RPATH = "xyes"; then
+                              JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/amd64/server/"
+                           fi
                         else
                            JAVA_LDFLAGS="-L$JDKHOME/jre/lib/server/ -ljvm -lpthread"
                            JAVA_CPPFLAGS="-I$JDKHOME/include/ -I$JDKHOME/include/darwin"
+                           if test x$JAVA_RPATH = "xyes"; then
+                              JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/server/"
+                           fi
                         fi
                 fi