From owner-svn-ports-all@freebsd.org Fri Sep 1 14:42:44 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39F72E12225; Fri, 1 Sep 2017 14:42:44 +0000 (UTC) (envelope-from linimon@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 mx1.freebsd.org (Postfix) with ESMTPS id 1585974623; Fri, 1 Sep 2017 14:42:44 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v81EghGH054196; Fri, 1 Sep 2017 14:42:43 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v81EghwS054195; Fri, 1 Sep 2017 14:42:43 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201709011442.v81EghwS054195@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Fri, 1 Sep 2017 14:42:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449081 - head/java/openjdk8 X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: head/java/openjdk8 X-SVN-Commit-Revision: 449081 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.23 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: Fri, 01 Sep 2017 14:42:44 -0000 Author: linimon Date: Fri Sep 1 14:42:43 2017 New Revision: 449081 URL: https://svnweb.freebsd.org/changeset/ports/449081 Log: The src tree is splitting 32-bit arm support into 'armv6' and the new 'armv7'. This patch adds armv7 support. It should provide no regression on any existing architecture. PR: 221896 Approved by: maintainer Modified: head/java/openjdk8/Makefile Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Fri Sep 1 14:36:10 2017 (r449080) +++ head/java/openjdk8/Makefile Fri Sep 1 14:42:43 2017 (r449081) @@ -66,7 +66,7 @@ X11_LIB_DEPENDS+= libXtst.so.6:x11/libXtst BUILD_DEPENDS+= ${UNZIP_CMD}:archivers/unzip .endif -ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64 +ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 WRKSRC= ${WRKDIR}/${PORTNAME} DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \ @@ -214,8 +214,8 @@ JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2sdk-image/jre .else JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2re-image .endif -JDK_JVMDIR= lib/${ARCH:C/armv6.*/arm/:S/powerpc64/ppc64/} -JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv6.*/arm/:S/i386/x86/:S/powerpc64/ppc64/} +JDK_JVMDIR= lib/${ARCH:C/armv.*/arm/:S/powerpc64/ppc64/} +JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/} INSTALLDIR= ${PREFIX}/${PKGBASE} NO_CCACHE= yes @@ -256,8 +256,10 @@ CONFIGURE_WRKSRC= ${WRKSRC}/common/autoconf OPTIONS_DEFINE= ALSA POLICY TZUPDATE X11 OPTIONS_DEFINE_armv6= FPUHACK +OPTIONS_DEFINE_armv7= FPUHACK OPTIONS_DEFAULT= ALSA POLICY TZUPDATE X11 OPTIONS_DEFAULT_armv6= FPUHACK +OPTIONS_DEFAULT_armv7= FPUHACK FPUHACK_DESC= Hack denormalized numbers in flush-to-zero mode POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data @@ -315,13 +317,13 @@ CONFIGURE_ARGS+= --with-tools-dir="${TOOLS_DIR:u:S/ /: .include -.if ${ARCH} == "armv6" || ${ARCH} == "i386" +.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 # XXX We must limit max heap size for 32-bit targets. CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m" MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m" .endif -.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "powerpc64" +.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64 JDK_BUILD_JVM= server .else JDK_BUILD_JVM= zero @@ -330,7 +332,7 @@ LIB_DEPENDS+= libffi.so:devel/libffi BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \ ${LOCALBASE}/openjdk7 -.if ${ARCH} == "armv6" +.if ${ARCH} == armv6 || ${ARCH} == armv7 BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk .endif @@ -343,7 +345,7 @@ BOOTSTRAPJDKDIR= ${BJDK} # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) -. if ${ARCH} == "armv6" +. if ${ARCH} == armv6 || ${ARCH} == armv7 # bootstrap-openjdk is based on openjdk7 and can compile openjdk8 BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk