--- a/make/lib/Awt2dLibraries.gmk Thu Oct 17 20:27:44 2019 +0100
+++ b/make/lib/Awt2dLibraries.gmk Thu Oct 17 20:53:35 2019 +0100
@@ -39,7 +39,7 @@
# We must not include java.desktop/unix/native/libmlib_image, which is only
# for usage by solaris-sparc in libmlib_image_v.
-BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix
+BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := /unix/
BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH
@@ -471,7 +471,6 @@
$(LIBAWT_HEADLESS_CFLAGS), \
EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
DISABLED_WARNINGS_gcc := unused-function, \
- DISABLED_WARNINGS_xlc := 1506-356, \
DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -481,10 +480,6 @@
LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \
))
- # AIX warning explanation:
- # 1506-356 : (W) Compilation unit is empty.
- # This happens during the headless build
-
$(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
TARGETS += $(BUILD_LIBAWT_HEADLESS)
@@ -698,7 +693,7 @@
ifeq ($(call isTargetOs, macosx), true)
# libjawt on macosx do not use the unix code
- LIBJAWT_EXCLUDE_SRC_PATTERNS := unix
+ LIBJAWT_EXCLUDE_SRC_PATTERNS := /unix/
endif
ifeq ($(call isTargetOs, macosx), true)
@@ -788,10 +783,11 @@
ifeq ($(call isTargetOs, macosx), true)
# libsplashscreen on macosx do not use the unix code
- LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix
+ LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := /unix/
endif
- LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0
+ LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
+ -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0
ifeq ($(call isTargetOs, linux), true)
ifeq ($(call isTargetCpuArch, ppc), true)
@@ -823,6 +819,7 @@
$(LIBM) -lpthread -liconv -losxapp \
-framework ApplicationServices \
-framework Foundation \
+ -framework Security \
-framework Cocoa \
-framework JavaNativeFoundation
else ifeq ($(call isTargetOs, windows), true)