forked from Lainports/opnsense-ports
8cb1a96ede
Taken from: https://github.com/freebsd/freebsd-ports.git Commit id: 5070672073b68be364139bc6b3a89100bd17d331
16 lines
767 B
Text
16 lines
767 B
Text
--- jdk/make/lib/CoreLibraries.gmk.orig 2014-11-08 19:58:00.000000000 -0800
|
|
+++ jdk/make/lib/CoreLibraries.gmk 2014-11-08 19:58:38.000000000 -0800
|
|
@@ -516,11 +516,11 @@
|
|
CFLAGS := $(CFLAGS_JDKLIB) \
|
|
-I$(JDK_TOPDIR)/src/share/npt \
|
|
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
|
|
- CFLAGS_bsd := -DLIBICONV_PLUG, \
|
|
+ CFLAGS_bsd := -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%, \
|
|
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
|
|
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
|
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
|
- LDFLAGS_bsd := , \
|
|
+ LDFLAGS_bsd := %%ICONV_LDFLAGS%%, \
|
|
LDFLAGS_macosx := -liconv, \
|
|
LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
|
|
LDFLAGS_SUFFIX_solaris := -lc, \
|