diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2014-11-09 05:23:31 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2014-11-09 05:23:31 +0000 |
| commit | ec0ba98b993c81ed38e78ce73a112c13b38a34d5 (patch) | |
| tree | a6ab2ce67fa7f0d68c6625edf3cca948ef5d7930 /java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk | |
| parent | Update multimedia/py-soco to 0.9. (diff) | |
. Update to 8u25.
Diffstat (limited to 'java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk index 0b836f2cef82..376f1997283e 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk @@ -1,14 +1,15 @@ ---- jdk/make/lib/CoreLibraries.gmk -+++ jdk/make/lib/CoreLibraries.gmk -@@ -496,10 +496,11 @@ +--- 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 := %%ICONV_CPPFLAGS%%, \ +- 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 := -liconv, \ +- LDFLAGS_bsd := , \ + LDFLAGS_bsd := %%ICONV_LDFLAGS%%, \ LDFLAGS_macosx := -liconv, \ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ |