diff options
Diffstat (limited to 'java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk index 519a1ee425a8..152e2943e8c5 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk @@ -1,19 +1,20 @@ ---- jdk/make/lib/ServiceabilityLibraries.gmk -+++ jdk/make/lib/ServiceabilityLibraries.gmk -@@ -244,6 +244,7 @@ +--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2014-11-08 19:59:40.000000000 -0800 ++++ jdk/make/lib/ServiceabilityLibraries.gmk 2014-11-08 20:00:50.000000000 -0800 +@@ -252,7 +252,7 @@ CFLAGS := $(LIBINSTRUMENT_CFLAGS), \ CFLAGS_debug := -DJPLIS_LOGGING, \ CFLAGS_release := -DNO_JPLIS_LOGGING, \ -+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \ +- CFLAGS_bsd := -DLIBICONV_PLUG, \ ++ CFLAGS_bsd := -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -@@ -258,7 +259,7 @@ - LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \ - 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_bsd := -liconv $(LIBZ), \ -+ LDFLAGS_SUFFIX_bsd := %%ICONV_LDFLAGS%% $(LIBZ), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=instrument.dll" \ +@@ -260,7 +260,7 @@ + LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ + LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ + LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \ +- -Xlinker --no-whole-archive, \ ++ -Xlinker --no-whole-archive %%ICONV_LDFLAGS%% $(LIBZ), \ + LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ + -framework Cocoa -framework Security -framework ApplicationServices, \ + LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \ |