|
 |
483cb6f |
diff -Naur pl-6.2.1.old/packages/jpl/configure pl-6.2.1/packages/jpl/configure
|
|
|
483cb6f |
--- pl-6.2.1.old/packages/jpl/configure 2012-09-09 17:01:25.000000000 +0200
|
|
|
483cb6f |
+++ pl-6.2.1/packages/jpl/configure 2012-09-10 13:02:26.450549569 +0200
|
|
|
483cb6f |
@@ -4555,24 +4555,6 @@
|
|
|
e93135e |
|
|
|
483cb6f |
CMDEXT=sh
|
|
 |
b1f9931 |
|
|
|
b1f9931 |
-if test "x$JAVALIBS" = "x"; then
|
|
|
b1f9931 |
- case "$PLARCH" in
|
|
|
b1f9931 |
- *darwin*)
|
|
|
b1f9931 |
- JAVALIBS="-Wl,-framework,JavaVM"
|
|
|
b1f9931 |
- ;;
|
|
|
b1f9931 |
- *powerpc-linux*)
|
|
|
b1f9931 |
- JAVALIBS="-ljava -ljvm"
|
|
|
b1f9931 |
- ;;
|
|
|
a9068bf |
- *win32*|*win64*)
|
|
|
a9068bf |
- JAVALIBS="-ljvm"
|
|
|
483cb6f |
- CMDEXT=bat
|
|
|
a9068bf |
- ;;
|
|
|
b1f9931 |
- *)
|
|
|
b1f9931 |
- JAVALIBS="-ljava -lverify -ljvm"
|
|
|
b1f9931 |
- ;;
|
|
|
b1f9931 |
- esac
|
|
|
b1f9931 |
-fi
|
|
|
b1f9931 |
-
|
|
|
a9068bf |
case "$PLARCH" in
|
|
|
3520a47 |
*win32*)
|
|
|
3520a47 |
JPLLDFLAGS="$JPLLDFLAGS -Wl,--kill-at"
|
|
|
483cb6f |
@@ -5534,15 +5516,25 @@
|
|
|
b1f9931 |
_JNI_LIBDIRS="lib/amd64"
|
|
|
b1f9931 |
_JNI_LIBSUBDIRS="server"
|
|
|
b1f9931 |
;;
|
|
|
b1f9931 |
+ alpha*)
|
|
|
b1f9931 |
+ _JNI_LIBDIRS="lib/alpha"
|
|
|
b1f9931 |
+ _JNI_LIBSUBDIRS="server"
|
|
|
b1f9931 |
+ ;;
|
|
|
b1f9931 |
powerpc)
|
|
|
b1f9931 |
- case "$host_os" in
|
|
|
b1f9931 |
- linux*)
|
|
|
b1f9931 |
- _JNI_LIBDIRS="lib/ppc bin"
|
|
|
b1f9931 |
- _JNI_LIBSUBDIRS="server classic"
|
|
|
b1f9931 |
- ;;
|
|
|
b1f9931 |
- *)
|
|
|
b1f9931 |
- _JNI_LIBDIRS=""
|
|
|
b1f9931 |
- esac
|
|
|
b1f9931 |
+ _JNI_LIBDIRS="lib/ppc"
|
|
|
b1f9931 |
+ _JNI_LIBSUBDIRS="server"
|
|
|
b1f9931 |
+ ;;
|
|
|
b1f9931 |
+ powerpc64)
|
|
|
b1f9931 |
+ _JNI_LIBDIRS="lib/ppc64"
|
|
|
b1f9931 |
+ _JNI_LIBSUBDIRS="server"
|
|
|
b1f9931 |
+ ;;
|
|
|
b1f9931 |
+ s390)
|
|
|
b1f9931 |
+ _JNI_LIBDIRS="lib/s390"
|
|
|
b1f9931 |
+ _JNI_LIBSUBDIRS="server"
|
|
|
b1f9931 |
+ ;;
|
|
|
b1f9931 |
+ s390x)
|
|
|
b1f9931 |
+ _JNI_LIBDIRS="lib/s390x"
|
|
|
b1f9931 |
+ _JNI_LIBSUBDIRS="server"
|
|
|
b1f9931 |
;;
|
|
|
b1f9931 |
*)
|
|
|
b1f9931 |
# Fallback option should work on all architectures except
|
|
|
483cb6f |
@@ -5551,6 +5543,29 @@
|
|
|
b1f9931 |
_JNI_LIBSUBDIRS="server"
|
|
|
b1f9931 |
esac
|
|
|
b1f9931 |
|
|
|
b1f9931 |
+# Set JAVALIBS differently if we're using GCJ
|
|
|
b1f9931 |
+if test "x$JAVALIBS" = "x"; then
|
|
|
b1f9931 |
+ if (echo $_JTOPDIR | grep gcj > /dev/null); then
|
|
|
b1f9931 |
+ JAVALIBS="-ljvm"
|
|
|
b1f9931 |
+ else
|
|
|
b1f9931 |
+ case "$PLARCH" in
|
|
|
b1f9931 |
+ *darwin*)
|
|
|
b1f9931 |
+ JAVALIBS="-Wl,-framework,JavaVM"
|
|
|
b1f9931 |
+ ;;
|
|
|
b1f9931 |
+ *powerpc-linux*)
|
|
|
b1f9931 |
+ JAVALIBS="-ljava -ljvm"
|
|
|
b1f9931 |
+ ;;
|
|
|
a9068bf |
+ *win32*|*win64*)
|
|
|
a9068bf |
+ JAVALIBS="-ljvm"
|
|
|
a9068bf |
+ ;;
|
|
|
b1f9931 |
+ *)
|
|
|
b1f9931 |
+ JAVALIBS="-ljava -lverify -ljvm"
|
|
|
b1f9931 |
+ ;;
|
|
|
b1f9931 |
+ esac
|
|
|
b1f9931 |
+ fi
|
|
|
b1f9931 |
+fi
|
|
|
b1f9931 |
+
|
|
|
b1f9931 |
+
|
|
|
b1f9931 |
for d in $_JNI_LIBDIRS; do
|
|
|
b1f9931 |
for subd in $_JNI_LIBSUBDIRS; do
|
|
|
b1f9931 |
echo "Trying $_JTOPDIR/jre/$d/$subd"
|