< prev index next >

make/lib/Awt2dLibraries.gmk

Print this page
@  rev 48707 : 8196218: [linux] libfontmanager should be linked against headless awt library
|  Summary: Also remove linker flags filtering (technical dept).
~  Reviewed-by: prr, erikj


 666     CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
 667     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
 668     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
 669     CFLAGS_windows = -DCC_NOEX, \
 670     WARNINGS_AS_ERRORS_xlc := false, \
 671     DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \
 672         type-limits missing-field-initializers, \
 673     DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
 674         maybe-uninitialized, \
 675     DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
 676         tautological-constant-out-of-range-compare int-to-pointer-cast, \
 677     DISABLED_WARNINGS_C_solstudio = \
 678         E_INTEGER_OVERFLOW_DETECTED \
 679         E_ARG_INCOMPATIBLE_WITH_ARG_L \
 680         E_ENUM_VAL_OVERFLOWS_INT_MAX, \
 681     DISABLED_WARNINGS_CXX_solstudio := \
 682         truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
 683         hidevf w_novirtualdescr arrowrtn2, \
 684     DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
 685     MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
 686     LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
 687         $(call SET_SHARED_LIBRARY_ORIGIN), \
 688     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
 689     LDFLAGS_macosx := -undefined dynamic_lookup, \
 690     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
 691     LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
 692     LIBS_linux := -lc, \
 693     LIBS_solaris := -lawt_headless -lc, \
 694     LIBS_aix := -lawt_headless,\
 695     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
 696         $(WIN_AWT_LIB), \
 697     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
 698     RC_FLAGS := $(RC_FLAGS) \
 699         -D "JDK_FNAME=fontmanager.dll" \
 700         -D "JDK_INTERNAL_NAME=fontmanager" \
 701         -D "JDK_FTYPE=0x2L", \
 702     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \
 703 ))
 704 
 705 $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager): $(BUILD_LIBFONTMANAGER_TARGET)
 706         $(install-file)
 707         ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
 708           ifeq ($(OPENJDK_TARGET_OS), macosx)
 709             # If bundling freetype on macosx, we need to rewrite the rpath location
 710             # in the libfontmanager library to point to the bundled location
 711             $(INSTALL_NAME_TOOL) -change \
 712                 `$(OTOOL) -D $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) | $(TAIL) -n1` \
 713                 '@rpath/$(call SHARED_LIBRARY,freetype)' \
 714                 $@
 715           endif
 716         endif
 717 
 718 BUILD_LIBFONTMANAGER += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
 719 
 720 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
 721 
 722 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
 723   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
 724 endif
 725 
 726 TARGETS += $(BUILD_LIBFONTMANAGER)
 727 
 728 ################################################################################
 729 
 730 ifeq ($(OPENJDK_TARGET_OS), windows)
 731   LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
 732   LIBJAWT_CFLAGS := -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \
 733       -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
 734       -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
 735       -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
 736       -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \
 737       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
 738       -I$(TOPDIR)/src/java.desktop/windows/native/include \
 739       -I$(TOPDIR)/src/java.desktop/share/native/include \
 740       $(LIBJAVA_HEADER_FLAGS) \
 741       #
 742 




 666     CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
 667     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
 668     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
 669     CFLAGS_windows = -DCC_NOEX, \
 670     WARNINGS_AS_ERRORS_xlc := false, \
 671     DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \
 672         type-limits missing-field-initializers, \
 673     DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
 674         maybe-uninitialized, \
 675     DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
 676         tautological-constant-out-of-range-compare int-to-pointer-cast, \
 677     DISABLED_WARNINGS_C_solstudio = \
 678         E_INTEGER_OVERFLOW_DETECTED \
 679         E_ARG_INCOMPATIBLE_WITH_ARG_L \
 680         E_ENUM_VAL_OVERFLOWS_INT_MAX, \
 681     DISABLED_WARNINGS_CXX_solstudio := \
 682         truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
 683         hidevf w_novirtualdescr arrowrtn2, \
 684     DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
 685     MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
 686     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
 687         $(call SET_SHARED_LIBRARY_ORIGIN), \
 688     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
 689     LDFLAGS_macosx := -undefined dynamic_lookup, \
 690     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
 691     LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
 692     LIBS_linux := -lawt_headless -lc, \
 693     LIBS_solaris := -lawt_headless -lc, \
 694     LIBS_aix := -lawt_headless,\
 695     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
 696         $(WIN_AWT_LIB), \
 697     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
 698     RC_FLAGS := $(RC_FLAGS) \
 699         -D "JDK_FNAME=fontmanager.dll" \
 700         -D "JDK_INTERNAL_NAME=fontmanager" \
 701         -D "JDK_FTYPE=0x2L", \
 702     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \
 703 ))
 704 
 705 $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager): $(BUILD_LIBFONTMANAGER_TARGET)
 706         $(install-file)
 707         ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
 708           ifeq ($(OPENJDK_TARGET_OS), macosx)
 709             # If bundling freetype on macosx, we need to rewrite the rpath location
 710             # in the libfontmanager library to point to the bundled location
 711             $(INSTALL_NAME_TOOL) -change \
 712                 `$(OTOOL) -D $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) | $(TAIL) -n1` \
 713                 '@rpath/$(call SHARED_LIBRARY,freetype)' \
 714                 $@
 715           endif
 716         endif
 717 
 718 BUILD_LIBFONTMANAGER += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
 719 
 720 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
 721 
 722 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix linux))
 723   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
 724 endif
 725 
 726 TARGETS += $(BUILD_LIBFONTMANAGER)
 727 
 728 ################################################################################
 729 
 730 ifeq ($(OPENJDK_TARGET_OS), windows)
 731   LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
 732   LIBJAWT_CFLAGS := -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \
 733       -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
 734       -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
 735       -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
 736       -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \
 737       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
 738       -I$(TOPDIR)/src/java.desktop/windows/native/include \
 739       -I$(TOPDIR)/src/java.desktop/share/native/include \
 740       $(LIBJAVA_HEADER_FLAGS) \
 741       #
 742 


< prev index next >