diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-02-27 06:54:30 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-02-27 06:54:30 +0000 |
| commit | 6a5bb1c2f8e0409a3d11252d1fba4a62851c7d11 (patch) | |
| tree | 3fc090983401b970aaa3808fa54d2bcf2bafbeb5 /java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | |
| parent | - Update to 1.0.29 (diff) | |
- Revert all damages done in r372338 and r379049.
- Really fix non-release builds. [1]
PR: 193009 [1]
Diffstat (limited to 'java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk index 49abeced3eda..451f7f0ff001 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk @@ -1,20 +1,20 @@ --- jdk/make/lib/ServiceabilityLibraries.gmk 2014-11-25 21:11:53 UTC +++ jdk/make/lib/ServiceabilityLibraries.gmk -@@ -252,15 +252,14 @@ $(eval $(call SetupNativeCompilation,BUI +@@ -252,7 +252,7 @@ CFLAGS := $(LIBINSTRUMENT_CFLAGS), \ CFLAGS_debug := -DJPLIS_LOGGING, \ CFLAGS_release := -DNO_JPLIS_LOGGING, \ - CFLAGS_bsd := -DLIBICONV_PLUG, \ -+ CFLAGS_bsd := -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%, \ ++ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ - $(LIBINSTRUMENT_LDFLAGS), \ - 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, \ -+ LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ - LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ - -framework Cocoa -framework Security -framework ApplicationServices, \ - LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \ +@@ -268,7 +268,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 := %%ICONV_LDFLAGS%% $(LIBZ), \ + VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=instrument.dll" \ |