diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2018-03-06 04:41:08 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2018-03-06 04:41:08 +0000 |
| commit | 9e41abde7ff2a28ab5904a2a97ce6a99906c4f2e (patch) | |
| tree | ebe9d350d111b1c903cf6c53121cd7162e5ae750 /java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | |
| parent | - Update to 2.11.50_20180306 (diff) | |
. Link libinstrument.so with iconv and jli as intended.
PR: 210297
Diffstat (limited to 'java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk index 5303ddd2016b..b62ab2248051 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk @@ -1,6 +1,17 @@ --- 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 -@@ -255,7 +255,7 @@ +@@ -247,15 +247,17 @@ + endif + + ifeq ($(OPENJDK_TARGET_OS), bsd) ++ 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 endif BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) @@ -9,12 +20,11 @@ endif endif -@@ -283,7 +283,7 @@ +@@ -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), \ -+ LDFLAGS_SUFFIX_bsd := %%ICONV_LDFLAGS%% $(LIBZ), \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=instrument.dll" \ |