43 |
43 |
44 LIBNET_SRC_DIRS := $(call FindSrcDirsForLib, java.base, net) |
44 LIBNET_SRC_DIRS := $(call FindSrcDirsForLib, java.base, net) |
45 |
45 |
46 $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \ |
46 $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \ |
47 NAME := net, \ |
47 NAME := net, \ |
48 SRC := $(LIBNET_SRC_DIRS), \ |
|
49 OPTIMIZATION := LOW, \ |
48 OPTIMIZATION := LOW, \ |
50 CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
49 CFLAGS := $(CFLAGS_JDKLIB), \ |
51 $(LIBJAVA_HEADER_FLAGS) $(addprefix -I, $(LIBNET_SRC_DIRS)), \ |
50 HEADER_FLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
|
51 $(LIBJAVA_HEADER_FLAGS), \ |
52 DISABLED_WARNINGS_gcc := format-nonliteral, \ |
52 DISABLED_WARNINGS_gcc := format-nonliteral, \ |
53 DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \ |
53 DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \ |
54 DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \ |
54 DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \ |
55 DISABLED_WARNINGS_solstudio := E_ARG_INCOMPATIBLE_WITH_ARG_L, \ |
55 DISABLED_WARNINGS_solstudio := E_ARG_INCOMPATIBLE_WITH_ARG_L, \ |
56 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
56 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
70 TARGETS += $(BUILD_LIBNET) |
70 TARGETS += $(BUILD_LIBNET) |
71 |
71 |
72 ################################################################################ |
72 ################################################################################ |
73 # Create the nio library |
73 # Create the nio library |
74 |
74 |
75 BUILD_LIBNIO_SRC := \ |
75 BUILD_LIBNIO_EXTRA_HEADERS := \ |
76 $(TOPDIR)/src/java.base/share/native/libnio \ |
76 $(call FindSrcDirsForComponent, java.base, libnio/ch) \ |
77 $(TOPDIR)/src/java.base/share/native/libnio/ch \ |
77 $(call FindSrcDirsForComponent, java.base, libnio/fs) \ |
78 $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio \ |
|
79 $(sort $(wildcard \ |
|
80 $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \ |
|
81 $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/fs \ |
|
82 $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/ch \ |
|
83 $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/fs)) \ |
|
84 # |
78 # |
85 |
|
86 BUILD_LIBNIO_CFLAGS := \ |
|
87 $(addprefix -I, $(BUILD_LIBNIO_SRC)) \ |
|
88 -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
|
89 $(LIBJAVA_HEADER_FLAGS) \ |
|
90 $(addprefix -I, $(BUILD_LIBNET_SRC)) |
|
91 |
79 |
92 $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \ |
80 $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \ |
93 NAME := nio, \ |
81 NAME := nio, \ |
94 SRC := $(BUILD_LIBNIO_SRC), \ |
|
95 EXCLUDE_FILES := $(BUILD_LIBNIO_EXFILES), \ |
|
96 OPTIMIZATION := HIGH, \ |
82 OPTIMIZATION := HIGH, \ |
97 WARNINGS_AS_ERRORS_xlc := false, \ |
83 WARNINGS_AS_ERRORS_xlc := false, \ |
98 CFLAGS := $(CFLAGS_JDKLIB) \ |
84 CFLAGS := $(CFLAGS_JDKLIB), \ |
99 $(BUILD_LIBNIO_CFLAGS), \ |
85 HEADER_FLAGS := \ |
|
86 -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
|
87 $(LIBJAVA_HEADER_FLAGS) \ |
|
88 $(addprefix -I, $(BUILD_LIBNET_SRC)) \ |
|
89 $(addprefix -I, $(BUILD_LIBNIO_EXTRA_HEADERS)), \ |
100 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
90 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
101 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
91 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
102 LIBS_unix := -ljava -lnet, \ |
92 LIBS_unix := -ljava -lnet, \ |
103 LIBS_linux := -lpthread $(LIBDL), \ |
93 LIBS_linux := -lpthread $(LIBDL), \ |
104 LIBS_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \ |
94 LIBS_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \ |
120 |
110 |
121 ifeq ($(OPENJDK_TARGET_OS), macosx) |
111 ifeq ($(OPENJDK_TARGET_OS), macosx) |
122 # JavaNativeFoundation framework not supported in static builds |
112 # JavaNativeFoundation framework not supported in static builds |
123 ifneq ($(STATIC_BUILD), true) |
113 ifneq ($(STATIC_BUILD), true) |
124 |
114 |
125 LIBOSXSECURITY_DIRS := $(TOPDIR)/src/java.base/macosx/native/libosxsecurity |
|
126 LIBOSXSECURITY_CFLAGS := -I$(LIBOSXSECURITY_DIRS) \ |
|
127 $(LIBJAVA_HEADER_FLAGS) \ |
|
128 -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
|
129 |
|
130 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \ |
115 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \ |
131 NAME := osxsecurity, \ |
116 NAME := osxsecurity, \ |
132 SRC := $(LIBOSXSECURITY_DIRS), \ |
|
133 OPTIMIZATION := LOW, \ |
117 OPTIMIZATION := LOW, \ |
134 CFLAGS := $(CFLAGS_JDKLIB) \ |
118 CFLAGS := $(CFLAGS_JDKLIB), \ |
135 $(LIBOSXSECURITY_CFLAGS), \ |
119 HEADER_FLAGS := $(LIBJAVA_HEADER_FLAGS) \ |
|
120 -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \ |
136 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
121 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
137 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
122 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
138 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \ |
123 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \ |
139 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
124 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
140 -fobjc-link-runtime, \ |
125 -fobjc-link-runtime, \ |
156 # Create the jsig library |
141 # Create the jsig library |
157 |
142 |
158 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) |
143 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) |
159 ifeq ($(STATIC_BUILD), false) |
144 ifeq ($(STATIC_BUILD), false) |
160 |
145 |
161 LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjsig |
|
162 LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS)) |
146 LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS)) |
163 |
147 |
164 ifeq ($(OPENJDK_TARGET_OS), linux) |
148 ifeq ($(OPENJDK_TARGET_OS), linux) |
165 # FIXME: This is probably not what we want to do, but keep it now for compatibility. |
149 # FIXME: This is probably not what we want to do, but keep it now for compatibility. |
166 LIBJSIG_CFLAGS := $(EXPORT_ALL_SYMBOLS) |
150 LIBJSIG_CFLAGS := $(EXPORT_ALL_SYMBOLS) |
167 endif |
151 endif |
168 |
152 |
169 $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \ |
153 $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \ |
170 NAME := jsig, \ |
154 NAME := jsig, \ |
171 SRC := $(LIBJSIG_SRC_DIR), \ |
|
172 CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \ |
155 CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \ |
173 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
156 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
174 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
157 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
175 LIBS_linux := $(LIBDL), \ |
158 LIBS_linux := $(LIBDL), \ |
176 LIBS_solaris := $(LIBDL), \ |
159 LIBS_solaris := $(LIBDL), \ |