Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation problems. ihse-jdk-library-branch
authorihse
Mon, 16 Apr 2018 14:51:31 +0200
branchihse-jdk-library-branch
changeset 56435 e177cddcbf77
parent 56434 69b4183fd7b8
child 56454 82c3ae69914f
Fix compilation problems.
make/lib/Awt2dLibraries.gmk file | annotate | diff | comparison | revisions
make/lib/CoreLibraries.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.crypto.mscapi.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.internal.le.gmk file | annotate | diff | comparison | revisions 
--- a/make/lib/Awt2dLibraries.gmk	Mon Apr 16 12:11:59 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Mon Apr 16 14:51:31 2018 +0200
@@ -108,11 +108,26 @@
 
 ################################################################################
 
-LIBAWT_DIRS := \
-    $(call FindSrcDirsForLib, java.desktop, awt) \
-    $(call FindSrcDirsForComponent, java.desktop, common/awt) \
+# FIXME:LIBS -- does not work. :(
+#LIBAWT_DIRS := \
+#    $(call FindSrcDirsForLib, java.desktop, awt) \
+#    $(call FindSrcDirsForComponent, java.desktop, common/awt) \
+#    #
+
+LIBAWT_DIRS := $(TOPDIR)/src/java.desktop/share/native/libawt \
+    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
+    $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
     #
 
+ifeq ($(OPENJDK_TARGET_OS), aix)
+  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/utility
+endif
+
 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
   LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
 endif
@@ -156,7 +171,7 @@
       #
 
   # Why does libawt need java.base headers?
-  LIBAWT_HEADER_FLAGS +=
+  LIBAWT_HEADER_FLAGS += \
       -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
       -I$(TOPDIR)/src/java.desktop/windows/native/include \
       -I$(TOPDIR)/src/java.desktop/share/native/include \
@@ -984,7 +999,7 @@
       -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
       -I$(TOPDIR)/src/java.base/share/native/libjava \
       -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
+      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
       #
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
--- a/make/lib/CoreLibraries.gmk	Mon Apr 16 12:11:59 2018 +0200
+++ b/make/lib/CoreLibraries.gmk	Mon Apr 16 14:51:31 2018 +0200
@@ -314,7 +314,8 @@
       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
       OPTIMIZATION := HIGH, \
-      CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
+      CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
+          $(addprefix -I, $(LIBJLI_SRC_DIRS)), \
       ARFLAGS := $(ARFLAGS), \
       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
   ))
@@ -333,7 +334,8 @@
       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
       OPTIMIZATION := HIGH, \
-      CFLAGS := $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
+      CFLAGS := $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
+          $(addprefix -I, $(LIBJLI_SRC_DIRS)), \
       LDFLAGS := -nostdlib $(ARFLAGS), \
       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
   ))
--- a/make/lib/Lib-jdk.crypto.mscapi.gmk	Mon Apr 16 12:11:59 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.mscapi.gmk	Mon Apr 16 14:51:31 2018 +0200
@@ -32,7 +32,7 @@
   $(eval $(call SetupJdkLibrary, BUILD_LIBSUNMSCAPI, \
       NAME := sunmscapi, \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB), \
+      CXXFLAGS := $(CXXFLAGS_JDKLIB), \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := crypt32.lib advapi32.lib, \
--- a/make/lib/Lib-jdk.internal.le.gmk	Mon Apr 16 12:11:59 2018 +0200
+++ b/make/lib/Lib-jdk.internal.le.gmk	Mon Apr 16 14:51:31 2018 +0200
@@ -32,8 +32,9 @@
   $(eval $(call SetupJdkLibrary, BUILD_LIBLE, \
       NAME := le, \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) $(LIBJAVA_HEADER_FLAGS), \
+      CXXFLAGS := $(CXXFLAGS_JDKLIB), \
       HEADER_FLAGS := \
+          $(LIBJAVA_HEADER_FLAGS) \
           -I$(SUPPORT_OUTPUTDIR)/headers/jdk.internal.le, \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(JDKLIB_LIBS) user32.lib, \
jdk-sandbox