From owner-svn-ports-all@freebsd.org Thu Feb 8 06:29:03 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 531E6F07005; Thu, 8 Feb 2018 06:29:03 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 06D9C75C02; Thu, 8 Feb 2018 06:29:03 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 01D1812468; Thu, 8 Feb 2018 06:29:03 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w186T2l0006534; Thu, 8 Feb 2018 06:29:02 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w186T2A9006532; Thu, 8 Feb 2018 06:29:02 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201802080629.w186T2A9006532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Thu, 8 Feb 2018 06:29:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461197 - in head/java: openjdk7 openjdk8 X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java: openjdk7 openjdk8 X-SVN-Commit-Revision: 461197 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Feb 2018 06:29:03 -0000 Author: glewis Date: Thu Feb 8 06:29:02 2018 New Revision: 461197 URL: https://svnweb.freebsd.org/changeset/ports/461197 Log: . Fix the build for i386 when WITH_LLD_IS_LD is set. PR: 225741 Submitted by: dim@ Modified: head/java/openjdk7/Makefile head/java/openjdk8/Makefile Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Thu Feb 8 05:52:06 2018 (r461196) +++ head/java/openjdk7/Makefile Thu Feb 8 06:29:02 2018 (r461197) @@ -162,6 +162,12 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/boo .include +.if ${ARCH} == i386 +# Fix the build for i386 when WITH_LLD_IS_LD is set +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225741 +MAKE_ENV+= LFLAGS="-Wl,-z,notext" +.endif + # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html .if ${COMPILER_TYPE} == gcc MAKE_ENV+= USE_PRECOMPILED_HEADER=0 Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Thu Feb 8 05:52:06 2018 (r461196) +++ head/java/openjdk8/Makefile Thu Feb 8 06:29:02 2018 (r461197) @@ -331,6 +331,12 @@ CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m" MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m" .endif +.if ${ARCH} == i386 +# Fix the build for i386 when WITH_LLD_IS_LD is set +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225741 +MAKE_ENV+= LFLAGS="-Wl,-z,notext" +.endif + .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64 JDK_BUILD_JVM= server .else