changeset 14780:a65826af2aa4

8004235: Disable native JGSS provider on Mac Reviewed-by: erikj, valeriep
author weijun
date Thu, 13 Dec 2012 08:11:38 +0800
parents f666fdc36388
children 701d0765f75f
files jdk/make/sun/security/Makefile jdk/makefiles/CompileNativeLibraries.gmk jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/sun/security/Makefile	Wed Dec 12 15:37:27 2012 -0800
+++ b/jdk/make/sun/security/Makefile	Thu Dec 13 08:11:38 2012 +0800
@@ -38,10 +38,12 @@
 SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
 include $(BUILDDIR)/common/Defs.gmk
 
-# build sun/security/jgss/wrapper on non-windows platform
+# build sun/security/jgss/wrapper on non-windows non-macosx platforms
 JGSS_WRAPPER =
 ifneq ($(PLATFORM), windows)
-    JGSS_WRAPPER = jgss/wrapper
+    ifneq ($(PLATFORM), macosx)
+    	JGSS_WRAPPER = jgss/wrapper
+    endif
 endif
 
 # Build PKCS#11 on all platforms
--- a/jdk/makefiles/CompileNativeLibraries.gmk	Wed Dec 12 15:37:27 2012 -0800
+++ b/jdk/makefiles/CompileNativeLibraries.gmk	Thu Dec 13 08:11:38 2012 +0800
@@ -2540,6 +2540,7 @@
 ##########################################################################################
 
 ifneq ($(OPENJDK_TARGET_OS), windows)
+ifneq ($(OPENJDK_TARGET_OS), macosx)
 $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\
 		LIBRARY:=j2gss,\
                 OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
@@ -2559,6 +2560,7 @@
 
 BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
 endif
+endif
 
 ##########################################################################################
 
--- a/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Wed Dec 12 15:37:27 2012 -0800
+++ b/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Thu Dec 13 08:11:38 2012 +0800
@@ -90,10 +90,6 @@
                                     "libgssapi_krb5.so",
                                     "libgssapi_krb5.so.2",
                                 };
-                            } else if (osname.contains("OS X")) {
-                                gssLibs = new String[]{
-                                    "/usr/lib/sasl2/libgssapiv2.2.so",
-                                };
                             }
                         } else {
                             gssLibs = new String[]{ defaultLib };