jdk-sandbox: comparison make/lib/Awt2dLibraries.gmk

equal deleted inserted replaced

-:e30211561a17
+:48ff68e2fe5c
 # for usage by solaris-sparc in libmlib_image_v.
 BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix
 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH
-ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+ifeq ($(call isTargetCpuBits, 64), true)
 BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
 endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
 NAME := mlib_image, \
 TARGETS += $(BUILD_LIBMLIB_IMAGE)
 ################################################################################
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
+ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpuArch, sparc)), true)
 # libmlib_image_v is basically built from mlib_image sources, with some additions
 # and some exclusions.
 LIBMLIB_IMAGE_V_SRC := \
 libmlib_image \
 #
 LIBMLIB_IMAGE_V_CFLAGS := -xarch=sparcvis -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
 $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
-ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+ifeq ($(call isTargetCpuBits, 64), true)
 LIBMLIB_IMAGE_V_CFLAGS += -DMLIB_OS64BIT
 endif
 BUILD_LIBMLIB_IMAGE_V_EXFILES := \
 awt_ImagingLib.c \
 LIBAWT_EXTRA_SRC := \
 common/awt/debug \
 $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
 #
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
+ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpuArch, sparc)), true)
 LIBAWT_EXTRA_SRC += $(TOPDIR)/src/$(MODULE)/share/native/common/awt/medialib
 endif
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 LIBAWT_EXTRA_SRC += \
 $(TOPDIR)/src/$(MODULE)/share/native/common/awt/utility \
 $(TOPDIR)/src/$(MODULE)/share/native/common/font \
 $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/opengl \
 $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
 #
 endif
-ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
+ifeq ($(call isTargetOs, solaris linux macosx aix), true)
 LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
 endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c
 endif
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 LIBAWT_EXFILES += \
 java2d/d3d/D3DShaderGen.c \
 awt/image/cvutils/img_colors.c \
 #
 endif
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
+ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpu, sparcv9)), true)
 LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
 else
 LIBAWT_EXCLUDES += \
 $(TOPDIR)/src/$(MODULE)/unix/native/libawt/awt/medialib \
 $(TOPDIR)/src/$(MODULE)/unix/native/libawt/java2d/loops \
 java.base:include \
 #
 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
+ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpu, sparcv9)), true)
 LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \
 $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
 LIBAWT_ASFLAGS = -P -xarch=v9a
 endif
-ifneq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), false)
 LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
 endif
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
-ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+ifeq ($(call isTargetCpuBits, 64), true)
 LIBAWT_CFLAGS += -DMLIB_OS64BIT
 endif
 LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
 LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
 endif
-ifeq ($(OPENJDK_TARGET_OS), linux)
+ifeq ($(call isTargetOs, linux), true)
 # FIXME: This is probably not what we want to do, but keep it now for compatibility.
 LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS)
 endif
 # Turn off all warnings for debug_mem.c This is needed because the specific warning
 -D "JDK_FTYPE=0x2L", \
 ))
 $(BUILD_LIBAWT): $(call FindLib, java.base, java)
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
 endif
 TARGETS += $(BUILD_LIBAWT)
 ################################################################################
-ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx), )
+ifeq ($(call isTargetOs, windows macosx), false)
 ifeq ($(ENABLE_HEADLESS_ONLY), false)
 LIBAWT_XAWT_EXTRA_SRC := \
 common/awt \
 common/java2d \
 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
 $(FONTCONFIG_CFLAGS) \
 $(CUPS_CFLAGS)
-ifeq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), true)
 LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
 endif
-ifeq ($(OPENJDK_TARGET_OS), linux)
+ifeq ($(call isTargetOs, linux), true)
 ifeq ($(DISABLE_XRENDER), true)
 LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
 endif
 endif
 LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm
-ifeq ($(OPENJDK_TARGET_OS), linux)
+ifeq ($(call isTargetOs, linux), true)
 LIBAWT_XAWT_LIBS += -lpthread
 endif
 ifeq ($(TOOLCHAIN_TYPE), gcc)
 # Turn off all warnings for the following files since they contain warnings
 TARGETS += $(BUILD_LIBJAVAJPEG)
 ################################################################################
 # Mac and Windows only use the native AWT lib, do not build libawt_headless
-ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
+ifeq ($(call isTargetOs, windows macosx), false)
 LIBAWT_HEADLESS_EXTRA_SRC := \
 common/font \
 common/java2d \
 $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
 BUILD_LIBFREETYPE_HEADER_DIRS := $(TOPDIR)/src/$(MODULE)/share/native/libfreetype/include
 BUILD_LIBFREETYPE_CFLAGS := -DFT2_BUILD_LIBRARY $(EXPORT_ALL_SYMBOLS)
 # For use by libfontmanager:
 LIBFREETYPE_CFLAGS := -I$(BUILD_LIBFREETYPE_HEADER_DIRS)
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib
 else
 LIBFREETYPE_LIBS := -lfreetype
 endif
 #### Begin harfbuzz configuration
 HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND
-ifneq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), false)
 HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
 -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H
 endif
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), linux macosx))
+ifeq ($(call isTargetOs, linux macosx), true)
 HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
 endif
-ifeq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), true)
 HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS
 endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 HARFBUZZ_CFLAGS += -DHAVE_CORETEXT
 endif
-ifneq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), false)
 LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
 endif
 # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
 LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
 LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
 BUILD_LIBFONTMANAGER_FONTLIB += $(LIBFREETYPE_LIBS)
 LIBFONTMANAGER_OPTIMIZATION := HIGH
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
 X11TextRenderer.c
 LIBFONTMANAGER_OPTIMIZATION := HIGHEST
-else ifeq ($(OPENJDK_TARGET_OS), macosx)
+else ifeq ($(call isTargetOs, macosx), true)
 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
 X11TextRenderer.c \
 fontpath.c \
 lcdglyph.c
 else
 $(WIN_AWT_LIB), \
 ))
 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt)
 endif
 ifeq ($(FREETYPE_TO_USE), bundled)
 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE)
 TARGETS += $(BUILD_LIBFONTMANAGER)
 ################################################################################
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 LIBJAWT_CFLAGS := -EHsc -DUNICODE -D_UNICODE
 LIBJAWT_EXTRA_HEADER_DIRS := \
 include \
 libawt/windows \
 java.base:include \
 java.base:libjava \
 #
-ifeq ($(OPENJDK_TARGET_CPU), x86)
+ifeq ($(call isTargetCpu, x86), true)
 KERNEL32_LIB := kernel32.lib
 endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
 NAME := jawt, \
 $(COPY_JAWT_LIB): $(BUILD_LIBJAWT)
 TARGETS += $(COPY_JAWT_LIB)
-else # OPENJDK_TARGET_OS not windows
+else # not windows
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 # libjawt on macosx do not use the unix code
 LIBJAWT_EXCLUDE_SRC_PATTERNS := unix
 endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 JAWT_LIBS := -lawt_lwawt
 else
 JAWT_LIBS :=
-ifneq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), false)
 JAWT_LIBS += -lawt
 endif
 ifeq ($(ENABLE_HEADLESS_ONLY), false)
 JAWT_LIBS += -lawt_xawt
 else
 JAWT_LIBS += -lawt_headless
-ifeq ($(OPENJDK_TARGET_OS), linux)
+ifeq ($(call isTargetOs, linux), true)
 JAWT_CFLAGS += -DHEADLESS
 endif
 endif
 endif
 $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
 else
 $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_headless)
 endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_lwawt)
 endif
-endif # OPENJDK_TARGET_OS
+endif
 TARGETS += $(BUILD_LIBJAWT)
 ################################################################################
 ifeq ($(USE_EXTERNAL_LIBZ), false)
 LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib
 endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 # libsplashscreen on macosx do not use the unix code
 LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix
 endif
 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0
-ifeq ($(OPENJDK_TARGET_OS), linux)
+ifeq ($(call isTargetOs, linux), true)
-ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
+ifeq ($(call isTargetCpuArch, ppc), true)
 LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
 endif
 endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
 BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
 BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
 BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
 BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
 BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
 BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
 BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
-else ifeq ($(OPENJDK_TARGET_OS), windows)
+else ifeq ($(call isTargetOs, windows), true)
 LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
 else
 LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
 endif
 LIBSPLASHSCREEN_LIBS :=
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 LIBSPLASHSCREEN_LIBS += \
 $(LIBM) -lpthread -liconv -losxapp \
 -framework ApplicationServices \
 -framework Foundation \
 -framework Cocoa \
 -framework JavaNativeFoundation
-else ifeq ($(OPENJDK_TARGET_OS), windows)
+else ifeq ($(call isTargetOs, windows), true)
 LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
 else
 LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
 endif
 LIBS_aix := -liconv, \
 ))
 TARGETS += $(BUILD_LIBSPLASHSCREEN)
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 $(BUILD_LIBSPLASHSCREEN): $(call FindLib, $(MODULE), osxapp)
 endif
 endif
 ################################################################################
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 LIBAWT_LWAWT_EXTRA_SRC := \
 $(TOPDIR)/src/$(MODULE)/unix/native/common/awt \
 $(TOPDIR)/src/$(MODULE)/share/native/common/font \
 $(TOPDIR)/src/$(MODULE)/share/native/common/java2d \
 endif
 ################################################################################
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
 NAME := osxui, \
 OPTIMIZATION := LOW, \
 CFLAGS := $(CFLAGS_JDKLIB), \

changeset 53683	48ff68e2fe5c
parent 53150	05429f43e036
child 53917	1ee9149df76f
child 57196	a95707a39ff5