Date: Tue, 6 Mar 2018 04:41:08 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463688 - in head/java/openjdk8: . files Message-ID: <201803060441.w264f8PF026514@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Tue Mar 6 04:41:08 2018 New Revision: 463688 URL: https://svnweb.freebsd.org/changeset/ports/463688 Log: . Link libinstrument.so with iconv and jli as intended. PR: 210297 Modified: head/java/openjdk8/Makefile head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Tue Mar 6 03:56:35 2018 (r463687) +++ head/java/openjdk8/Makefile Tue Mar 6 04:41:08 2018 (r463688) @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ Modified: head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk ============================================================================== --- head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk Tue Mar 6 03:56:35 2018 (r463687) +++ head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk Tue Mar 6 04:41:08 2018 (r463688) @@ -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" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803060441.w264f8PF026514>