From nobody Thu Jan 13 02:47:18 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DA0B2195532E; Thu, 13 Jan 2022 02:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JZ83V4N5Tz4qd7; Thu, 13 Jan 2022 02:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 769F418B49; Thu, 13 Jan 2022 02:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20D2lIma032862; Thu, 13 Jan 2022 02:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20D2lIaH032861; Thu, 13 Jan 2022 02:47:18 GMT (envelope-from git) Date: Thu, 13 Jan 2022 02:47:18 GMT Message-Id: <202201130247.20D2lIaH032861@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jung-uk Kim Subject: git: 701f037632a1 - main - java/openjdk17-jre: Add JRE-only package for java/openjdk17 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 701f037632a18f528fd7d28eb4584266b7e6be5e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642042038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h6Owh0/g+ftVhVxGPYFDfJ0CvuZXJroLzNhLRtbkE5Y=; b=WTKgqwigdiwvOgMB/xaB7QEcUVXGs3tf93hyjT/CmHNCf4xu+3jMeL8PndZPmVMxoZG8uR CWMS/7WreGWRRYutptMf2cJQ4ZtuWtFyYjKkUEcfW3RJi/9BnSEDWYONvjub1uPCOokAlK yFfMSnuWUL5j9DRGMr4QoVpD+gRFg3w0FMhHwaN4YBecy1aYd2+xpVHaNGiE02xHgU6wBe am6QOrsVMahaY8ODE3OvPDGfKqi8BKWAk00qq4u4tb8bpS5lKSN5/dve+Dgr3EWPVH7m1t cetJRdw/g6bfmjwaEstiONQYRPvPpksD8xMjmJJjnzgVSB+8gDOmacCIpTkWLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642042038; a=rsa-sha256; cv=none; b=Gd7fIR9fJqdTuSzuNj5w7GC4ujUs706H9pEDr7p+rVnU5CvjfgZNgsU54DWG4ocGm63YMK /qkdBKMOWi+iwfX+1ZaffAshUK1fJUCnQs3aYU7yNzjphleonPZbTidUKhyyGxfowgvlSX aXjjictJ6aJdjJdKrH/uF1/zweBjg/K53SIyKJQnJbxLZcAP0vpGqOHc0phU9U7uKZ5E/J FhFqHDyHj2ojSYggDWeyC+Vj0uBIjZR4KivpHvARiW3jU/6AevN8bHUhOYRYdQzK2+7Xgp KQqqArFk2mkt9jOFhNJAUb9yqYT36r5Vf4T0EeeY7Eu2+AEoToIlQhQ0WSGAHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=701f037632a18f528fd7d28eb4584266b7e6be5e commit 701f037632a18f528fd7d28eb4584266b7e6be5e Author: Jung-uk Kim AuthorDate: 2022-01-13 02:33:11 +0000 Commit: Jung-uk Kim CommitDate: 2022-01-13 02:43:58 +0000 java/openjdk17-jre: Add JRE-only package for java/openjdk17 --- java/Makefile | 1 + java/openjdk17-jre/Makefile | 8 ++++++++ java/openjdk17/Makefile | 12 ++++++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/java/Makefile b/java/Makefile index 18cae5108cc8..fe25cba44b73 100644 --- a/java/Makefile +++ b/java/Makefile @@ -96,6 +96,7 @@ SUBDIR += openjdk15 SUBDIR += openjdk16 SUBDIR += openjdk17 + SUBDIR += openjdk17-jre SUBDIR += openjdk7 SUBDIR += openjdk7-jre SUBDIR += openjdk8 diff --git a/java/openjdk17-jre/Makefile b/java/openjdk17-jre/Makefile new file mode 100644 index 000000000000..15798e22188e --- /dev/null +++ b/java/openjdk17-jre/Makefile @@ -0,0 +1,8 @@ +PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre + +COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} + +BUILD_JRE= yes +MASTERDIR= ${.CURDIR}/../openjdk17 + +.include "${MASTERDIR}/Makefile" diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index bf439e6a8661..c1d45bfad152 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -5,7 +5,7 @@ CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} MAINTAINER= java@FreeBSD.org -COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} +COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 @@ -50,7 +50,11 @@ MAKE_ENV= LANG="C" \ JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} +.if defined(BUILD_JRE) +JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre +.else JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk +.endif INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes @@ -99,7 +103,11 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} +.if defined(BUILD_JRE) +ALL_TARGET= legacy-images +.else ALL_TARGET= images +.endif JDK_BUILD_TYPE= release .include @@ -135,7 +143,7 @@ CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} .if ${COMPILER_TYPE} == gcc USE_GCC= yes -CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \ +CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" .else