changeset 1333:8a788d97978b

- Add new configure argument --enable-static-libjli for bsd only. By default libjli will be linked as a shared library, however this requires working rpath $ORIGIN support. This configure argument can be used to link libjli staticly for use when ORIGIN support is not ready yet. Suggested by Jung-uk Kim Reviewed By: Jung-uk Kim (jukim)
author kurt
date Thu, 21 May 2015 08:30:48 -0400
parents fdc54d6b49b3
children efcdaab49c6c
files common/autoconf/jdk-options.m4 common/autoconf/spec.gmk.in
diffstat 2 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/jdk-options.m4	Sat May 16 12:14:49 2015 -0400
+++ b/common/autoconf/jdk-options.m4	Thu May 21 08:30:48 2015 -0400
@@ -407,6 +407,20 @@
 
   ###############################################################################
   #
+  # Enable or disable static linking of libjli on bsd only
+  #
+  AC_ARG_ENABLE(static-libjli, [AS_HELP_STRING([--enable-static-libjli],
+      [Enable staticly linking libjli on bsd @<:@disabled@:>@])],,
+      [enable_static_libjli=no])
+  if test "x$OPENJDK_TARGET_OS" = "xbsd" && test "x$enable_static_libjli" = "xyes"; then
+    BSD_STATIC_LIBJLI=bsd
+  else
+    BSD_STATIC_LIBJLI=
+  fi
+  AC_SUBST(BSD_STATIC_LIBJLI)
+
+  ###############################################################################
+  #
   # Enable or disable the elliptic curve crypto implementation
   #
   AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
--- a/common/autoconf/spec.gmk.in	Sat May 16 12:14:49 2015 -0400
+++ b/common/autoconf/spec.gmk.in	Thu May 21 08:30:48 2015 -0400
@@ -284,6 +284,9 @@
 # Enable unlimited crypto policy
 UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
 
+# Build static libjli on bsd
+BSD_STATIC_LIBJLI=@BSD_STATIC_LIBJLI@
+
 # Necessary additional compiler flags to compile X11
 X_CFLAGS:=@X_CFLAGS@
 X_LIBS:=@X_LIBS@