diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2015-07-19 14:23:54 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2015-07-19 14:23:54 +0000 |
| commit | 8088e0cda1ff0aa065274972fcfc56c3d90cab3a (patch) | |
| tree | e5a81c85994e8d9b9193d03aeb4c01ba2e442a19 /java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | |
| parent | Update to 1.8.14p1 (diff) | |
. Update to 8u51.
Notes
Notes:
svn path=/head/; revision=392506
Diffstat (limited to '')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk index 451f7f0ff001..01264c9e4c63 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk @@ -1,19 +1,19 @@ ---- jdk/make/lib/ServiceabilityLibraries.gmk 2014-11-25 21:11:53 UTC -+++ jdk/make/lib/ServiceabilityLibraries.gmk -@@ -252,7 +252,7 @@ +--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2015-07-18 14:43:00.000000000 -0700 ++++ jdk/make/lib/ServiceabilityLibraries.gmk 2015-07-18 14:44:25.000000000 -0700 +@@ -269,7 +269,7 @@ CFLAGS := $(LIBINSTRUMENT_CFLAGS), \ CFLAGS_debug := -DJPLIS_LOGGING, \ CFLAGS_release := -DNO_JPLIS_LOGGING, \ -- CFLAGS_bsd := -DLIBICONV_PLUG, \ +- CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \ + CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -@@ -268,7 +268,7 @@ +@@ -283,7 +283,7 @@ LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \ LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \ LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\ -- LDFLAGS_SUFFIX_bsd := -liconv $(LIBZ), \ +- LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \ + LDFLAGS_SUFFIX_bsd := %%ICONV_LDFLAGS%% $(LIBZ), \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ |