diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2018-05-21 00:03:43 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2018-05-21 00:03:43 +0000 |
| commit | bbac75f33c19dca50407c8cfcfcd59887233c456 (patch) | |
| tree | 76505f378d2a4325b6cbd8117b9a655e7b15273e /java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | |
| parent | - Fix whitespace. (diff) | |
. Update to 8u172.
Notes
Notes:
svn path=/head/; revision=470492
Diffstat (limited to '')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk index b62ab2248051..e7d8afbd424f 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk @@ -1,17 +1,15 @@ ---- 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 -@@ -247,15 +247,17 @@ +--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2018-05-20 12:20:24.536007000 -0700 ++++ jdk/make/lib/ServiceabilityLibraries.gmk 2018-05-20 12:22:29.309856000 -0700 +@@ -247,7 +247,7 @@ endif ifeq ($(OPENJDK_TARGET_OS), bsd) +- LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(PACKAGE_PATH)/lib -liconv $(LIBZ) + LIBINSTRUMENT_LDFLAGS_SUFFIX += %%ICONV_LDFLAGS%% $(LIBZ) ifeq ($(BSD_STATIC_LIBJLI), bsd) LIBINSTRUMENT_LDFLAGS += -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \ -- -Xlinker --no-whole-archive -+ -Xlinker --no-whole-archive - else - LIBINSTRUMENT_LDFLAGS += $(call SET_SHARED_LIBRARY_ORIGIN,/jli) -+ LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(INSTALL_LIBRARIES_HERE)/jli -ljli + -Xlinker --no-whole-archive +@@ -257,7 +257,7 @@ endif BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) @@ -20,11 +18,3 @@ endif endif -@@ -283,7 +284,6 @@ - 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 := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=instrument.dll" \ |