From nobody Tue Sep 10 11:36:16 2024 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 4X31qh4jCKz5WHpN; Tue, 10 Sep 2024 11:36:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X31qh416hz4rTM; Tue, 10 Sep 2024 11:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725968176; 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=dvR9PSy0eQO5ByYOxb9+lkO0nng05TBGLxBIxy5/UPA=; b=u/CbkUpSYHesoxbWYgXud/LMbmH3JNm/6syiewvoLTMRJP8OHlqmfHBOCPNI8FPeNhf9h0 ktunjo+t+AG9CpYcoFTUyj5q0LN7UUWADbHKNyE/ZVYhTOl2kVAyLKc+CMI5MhdxlmKl2g acuD4r53EyIQEjYeXT0EQzcK4V6JzYCNxyiwn+p2z+JHlI6CxLTPeaAOnE1kvMcOcXAQcE SjePv/i3HvvfjQcH4tRw1MY21KSjDMbdUTmM7UHGXFnD8LgWwGzOcUKSiYmsg4waLiIIIE TsEXUOshjwA7S4gz6FXl5hS/9RTzIxYOruIfTo3rqE2fL7htLCue7KMsGc8Sjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725968176; a=rsa-sha256; cv=none; b=UF6CN3kmhbTHSDcRcGoRUPM6zHTcRoaj6yQxpU/bnCKWT+fVV66NQ76vozTcuItjoSiURk 6goPelWMyiARkyg14kDSnMvkpDx+BsPAvfXG0+BT+mqQWTnlav+hSc2NB8wiraMWn/rVuz VcLNX3asQwR9pbsEhmbuWtPgaI22NgsGJtXxAJbE5O5K2aHG4RNUcVpA6YOUe9JWte0bpO p0anjIGRH+XftK+rFmPhJDLMDpCaYTaEzHEGD8q9dDL9RdXMA3ACL2/J+h7XD6HPHOXESa t2R6bWCpNJojVTurEFgzjc4cDPM+mgmYY6lwTrYzYrqV0qnQV28SauT367fksA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725968176; 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=dvR9PSy0eQO5ByYOxb9+lkO0nng05TBGLxBIxy5/UPA=; b=fQlzadaE1dLr6ODPjr2mAdmCc3N8T7Foy5FOI8It4fv8Guv5z2kFF+KKmJoresZvU/rKne ZWDF6AuKFRduqJVPBj3QiegsPd+4Biu5SWRgUxlAJESkejVNkHpv1QeY+RRDHxAHc1oXW4 d8S0JxsN5eRnClcSTGb3ByN2HHuWpQeDFOoNfKBDXdIoIp+4qz3smVI6oGw2Z/AVelOSSv 1QpZg8mJeOVAoFEmET0bKkmv6u3ABGrIRlIJ9R3j5gfhDqnbhj9KCEdayrUIEFA7vj5E7c dSonw28WIgKT7/V6FbzT0fMdBn4vnBY3CwuuVGHWT7zLxKpH36xQCKfu0rMpjQ== 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 4X31qh3cNxzmBW; Tue, 10 Sep 2024 11:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48ABaG3M039866; Tue, 10 Sep 2024 11:36:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48ABaG03039863; Tue, 10 Sep 2024 11:36:16 GMT (envelope-from git) Date: Tue, 10 Sep 2024 11:36:16 GMT Message-Id: <202409101136.48ABaG03039863@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: e3120f0ac06e - main - java/openjdk11: respect compiler and linker flags 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3120f0ac06e578482a669fe51fb65fb2bcb6619 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3120f0ac06e578482a669fe51fb65fb2bcb6619 commit e3120f0ac06e578482a669fe51fb65fb2bcb6619 Author: Mikhail T. AuthorDate: 2024-09-09 07:50:21 +0000 Commit: Ronald Klop CommitDate: 2024-09-10 11:34:53 +0000 java/openjdk11: respect compiler and linker flags pass CFLAGS, CXXFLAGS and LDFLAGS to the build This enables more easily testing different build options. fix build on gcc by passing --disable-precompiled-headers not only on powerpc64 "Without this, I was getting PCH-error from g++12 on my amd64 machine too." PR: 279367 Tested by: poudriere Approved by: maintainer timeout (java@) --- java/openjdk11/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 4e1ad8b25325..da7fa2f9fea1 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -1,6 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -88,6 +89,9 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --disable-hotspot-gtest \ --with-jvm-features=shenandoahgc \ --with-alsa=${LOCALBASE} \ + --with-extra-cflags="${CFLAGS}" \ + --with-extra-cxxflags="${CXXFLAGS}" \ + --with-extra-ldflags="${LDFLAGS}" \ --with-fontconfig=${LOCALBASE} \ --with-freetype=system \ --with-freetype-include=${LOCALBASE}/include/freetype2 \ @@ -147,9 +151,10 @@ 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${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}" +LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT} +CFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} +CXXFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} +CONFIGURE_ARGS+=--disable-precompiled-headers .else MAKE_ENV+= USE_CLANG=true .endif