提交 c597db0e 编写于 作者: W weijun

8004235: Disable native JGSS provider on Mac

Reviewed-by: erikj, valeriep
上级 0e209131
...@@ -38,10 +38,12 @@ SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true ...@@ -38,10 +38,12 @@ SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
include $(BUILDDIR)/common/Defs.gmk 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 = JGSS_WRAPPER =
ifneq ($(PLATFORM), windows) ifneq ($(PLATFORM), windows)
JGSS_WRAPPER = jgss/wrapper ifneq ($(PLATFORM), macosx)
JGSS_WRAPPER = jgss/wrapper
endif
endif endif
# Build PKCS#11 on all platforms # Build PKCS#11 on all platforms
......
...@@ -2540,6 +2540,7 @@ BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC) ...@@ -2540,6 +2540,7 @@ BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
########################################################################################## ##########################################################################################
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
ifneq ($(OPENJDK_TARGET_OS), macosx)
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\
LIBRARY:=j2gss,\ LIBRARY:=j2gss,\
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
...@@ -2559,6 +2560,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\ ...@@ -2559,6 +2560,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\
BUILD_LIBRARIES += $(BUILD_LIBJ2GSS) BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
endif endif
endif
########################################################################################## ##########################################################################################
......
...@@ -90,10 +90,6 @@ public final class SunNativeProvider extends Provider { ...@@ -90,10 +90,6 @@ public final class SunNativeProvider extends Provider {
"libgssapi_krb5.so", "libgssapi_krb5.so",
"libgssapi_krb5.so.2", "libgssapi_krb5.so.2",
}; };
} else if (osname.contains("OS X")) {
gssLibs = new String[]{
"/usr/lib/sasl2/libgssapiv2.2.so",
};
} }
} else { } else {
gssLibs = new String[]{ defaultLib }; gssLibs = new String[]{ defaultLib };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册