make/lib/Awt2dLibraries.gmk

Print this page

        

*** 707,731 **** $(BUILD_LIBLCMS): $(BUILD_LIBAWT) ########################################################################################## ifdef OPENJDK ! BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers else ! BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed ! BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg ! BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC) endif ! BUILD_LIBJPEG_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_CPU), x86_64) ! BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) endif endif # Suppress gcc warnings like "variable might be clobbered by 'longjmp' # or 'vfork'": this warning indicates that some variable is placed to # a register by optimized compiler and it's value might be lost on longjmp(). # Recommended way to avoid such warning is to declare the variable as # volatile to prevent the optimization. However, this approach does not --- 707,734 ---- $(BUILD_LIBLCMS): $(BUILD_LIBAWT) ########################################################################################## + BUILD_LIBJAVAJPEG_DIR := $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg + ifdef OPENJDK ! BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers else ! BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed ! BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg ! BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJAVAJPEG_CLOSED_SRC) endif ! BUILD_LIBJAVAJPEG_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_CPU), x86_64) ! BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) endif endif + # Suppress gcc warnings like "variable might be clobbered by 'longjmp' # or 'vfork'": this warning indicates that some variable is placed to # a register by optimized compiler and it's value might be lost on longjmp(). # Recommended way to avoid such warning is to declare the variable as # volatile to prevent the optimization. However, this approach does not
*** 733,773 **** #ifndef CROSS_COMPILE_ARCH # CC_43_OR_NEWER := \ # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # ifeq ($(CC_43_OR_NEWER), 1) ! # BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered # endif #endif ! $(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \ ! LIBRARY := jpeg, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ ! SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \ ! $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \ LANG := C, \ OPTIMIZATION := HIGHEST, \ CFLAGS := $(CFLAGS_JDKLIB) \ ! $(BUILD_LIBJPEG_CLOSED_INCLUDES) \ ! -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \ ! MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \ ! LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ ! -D "JDK_FNAME=jpeg.dll" \ ! -D "JDK_INTERNAL_NAME=jpeg" \ -D "JDK_FTYPE=0x2L", \ ! REORDER := $(BUILD_LIBJPEG_REORDER), \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) ! $(BUILD_LIBJPEG): $(BUILD_LIBJAVA) ! BUILD_LIBRARIES += $(BUILD_LIBJPEG) ########################################################################################## ifndef OPENJDK FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k --- 736,789 ---- #ifndef CROSS_COMPILE_ARCH # CC_43_OR_NEWER := \ # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # ifeq ($(CC_43_OR_NEWER), 1) ! # BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered # endif #endif ! ifeq ($(USE_EXTERNAL_LIBJPEG), true) ! LIBJPEG_LIBS := -ljpeg ! BUILD_LIBJAVAJPEG_INCLUDE_FILES := \ ! imageIOJPEG.c \ ! jpegdecoder.c ! BUILD_LIBJAVAJPEG_HEADERS := ! else ! LIBJPEG_LIBS := ! BUILD_LIBJAVAJPEG_INCLUDE_FILES := ! BUILD_LIBJAVAJPEG_HEADERS := -I$(BUILD_LIBJAVAJPEG_DIR) ! endif ! ! $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \ ! LIBRARY := javajpeg, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ ! SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \ ! $(BUILD_LIBJAVAJPEG_DIR), \ ! INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ LANG := C, \ OPTIMIZATION := HIGHEST, \ CFLAGS := $(CFLAGS_JDKLIB) \ ! $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \ ! $(BUILD_LIBJAVAJPEG_HEADERS), \ ! MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ ! LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ ! -D "JDK_FNAME=javajpeg.dll" \ ! -D "JDK_INTERNAL_NAME=javajpeg" \ -D "JDK_FTYPE=0x2L", \ ! REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) ! $(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA) ! BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG) ########################################################################################## ifndef OPENJDK FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
*** 1211,1220 **** --- 1227,1243 ---- else LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib endif + ifeq ($(USE_EXTERNAL_LIBJPEG), true) + LIBJPEG_LDFLAGS := -ljpeg + else + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg + LIBJPEG_CFLAGS := $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg + endif + ifeq ($(USE_EXTERNAL_LIBPNG), false) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/libpng LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng endif
*** 1274,1289 **** SRC := $(LIBSPLASHSCREEN_DIRS), \ EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ ! $(GIFLIB_CFLAGS) $(PNG_CFLAGS), \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ ! $(GIFLIB_LDFLAGS) $(PNG_LIBS), \ LDFLAGS_SUFFIX_solaris := -lc, \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=splashscreen.dll" \ -D "JDK_INTERNAL_NAME=splashscreen" \ --- 1297,1312 ---- SRC := $(LIBSPLASHSCREEN_DIRS), \ EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ ! $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS), \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ ! $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(PNG_LIBS), \ LDFLAGS_SUFFIX_solaris := -lc, \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=splashscreen.dll" \ -D "JDK_INTERNAL_NAME=splashscreen" \