Date: Thu, 28 Sep 2017 20:14:21 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450869 - head/java/openjdk8 Message-ID: <201709282014.v8SKELYh034830@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Sep 28 20:14:21 2017 New Revision: 450869 URL: https://svnweb.freebsd.org/changeset/ports/450869 Log: Use java/bootstrap-openjdk8 to bootstrap. Modified: head/java/openjdk8/Makefile Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Thu Sep 28 20:12:51 2017 (r450868) +++ head/java/openjdk8/Makefile Thu Sep 28 20:14:21 2017 (r450869) @@ -315,6 +315,23 @@ TOOLS_DIR+= ${${t}:S|/${BUILD_${t}}$||} CONFIGURE_ARGS+= --with-tools-dir="${TOOLS_DIR:u:S/ /:/g}" .endif +BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \ + ${LOCALBASE}/openjdk7 \ + ${LOCALBASE}/bootstrap-openjdk8 + +# do we have valid native jdk installed? +.for BJDK in ${BOOTSTRAP_JDKS} +. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) +BOOTSTRAPJDKDIR= ${BJDK} +. endif +.endfor + +# if no valid jdk found, set dependency +.if !defined(BOOTSTRAPJDKDIR) +BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk8 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk8 +.endif + .include <bsd.port.pre.mk> .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 @@ -328,31 +345,6 @@ JDK_BUILD_JVM= server .else JDK_BUILD_JVM= zero LIB_DEPENDS+= libffi.so:devel/libffi -.endif - -BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \ - ${LOCALBASE}/openjdk7 -.if ${ARCH} == armv6 || ${ARCH} == armv7 -BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk -.endif - -# do we have valid native jdk installed? -.for BJDK in ${BOOTSTRAP_JDKS} -. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) -BOOTSTRAPJDKDIR= ${BJDK} -. endif -.endfor - -# if no valid jdk found, set dependency -.if !defined(BOOTSTRAPJDKDIR) -. 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 -. else -BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk7 -BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk7 -. endif .endif .if ${COMPILER_TYPE} == clang
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709282014.v8SKELYh034830>