Skip to content

Build the systemconf library on all platforms #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2022
Merged

Build the systemconf library on all platforms #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions make/modules/java.base/Lib.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,17 @@ ifeq ($(USE_SYSCONF_NSS), true)
LIBSYSTEMCONF_CXXFLAGS += $(NSS_CFLAGS) -DSYSCONF_NSS
endif

ifeq ($(OPENJDK_BUILD_OS), linux)
$(eval $(call SetupJdkLibrary, BUILD_LIBSYSTEMCONF, \
NAME := systemconf, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) $(LIBSYSTEMCONF_CFLAGS), \
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBSYSTEMCONF_CXXFLAGS), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS_unix := $(LIBDL) $(NSS_LIBS), \
))
$(eval $(call SetupJdkLibrary, BUILD_LIBSYSTEMCONF, \
NAME := systemconf, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) $(LIBSYSTEMCONF_CFLAGS), \
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBSYSTEMCONF_CXXFLAGS), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS_unix := $(LIBDL) $(NSS_LIBS), \
))

TARGETS += $(BUILD_LIBSYSTEMCONF)
endif
TARGETS += $(BUILD_LIBSYSTEMCONF)

################################################################################
# Create the symbols file for static builds.
Expand Down
12 changes: 12 additions & 0 deletions ...e/linux/native/libsystemconf/systemconf.c → ...e/share/native/libsystemconf/systemconf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include "jvm_md.h"
#include <stdio.h>

#ifdef LINUX

#ifdef SYSCONF_NSS
#include <nss3/pk11pub.h>
#else
Expand Down Expand Up @@ -222,3 +224,13 @@ JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEn
return (fips_enabled == '1' ? JNI_TRUE : JNI_FALSE);
}
}

#else // !LINUX

JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEnabled
(JNIEnv *env, jclass cls)
{
return JNI_FALSE;
}

#endif