From nobody Tue Dec 05 18:11:29 2023 X-Original-To: dev-commits-ports-main@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 4Sl7ry1mtfz53HWB; Tue, 5 Dec 2023 18:11:30 +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 4Sl7ry1Jxhz3W4y; Tue, 5 Dec 2023 18:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701799890; 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=p0++tk+L4cKX98AY14BeIhdTUkY/mw2vU9amHrVlVRk=; b=jTh+u1MvftbIhlOHwMvMFIu/kvrCSCIANtHDem5iVpzBb5a1ReprA43yDFNO5ulo3AI1Py ZH99gl89DxV58pWjf82XycAkX2ToPpEe+x9z/aWNsrhzohr5wb0/Q4lLFWvZVtoBE0QUsV tEHZ4ADj4Z24pw0y4n5Q0V7dnvvf4H09p1DamNcDwwV4pjlzjOREms1um1Q7wD9qyXr2K7 bwvuVRHGTsy4P9A9Yf3JSpGHlTSt5hTFLIev+gcDAJ1EX6usYOI3oQS4LJFnpIGodJ34N1 sig8klpR+UQ7wUZdI1KXxAS3If15wpZwOj3iA7RqguwVpRDzZRNPZqqtQ7pguw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701799890; a=rsa-sha256; cv=none; b=BQRErBq6Q2XDPxDjOCxFvy+gPTMlTVB/OfOkaFSgzh73ffVh7VgU6QApdlTD+K+cBuufZe LXeVLKDs7hUAzIZxLmhXJGokPsygrqnUCh/uEjCJWPuF0hRx6FSRUkm3FY2TclqCDOd1QX 6kNruNxAUPgW2La6AlGaOz2dW+H7ew6eGza4S21B1DiTPLZiCHZ5XQtMk/eUFHsv6jvPY5 IDSJaVEQO+xRfPrhoDReQmLCVFEOjd+iOnD7ImSppcKNzZhYydll9kQyhZfN80VpOkQw4/ x98yLMXJS93L+sVE274DyvCZ/YILlP2REe83v2EPOK0tMWSa9e1S0OoD5lcWyQ== 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=1701799890; 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=p0++tk+L4cKX98AY14BeIhdTUkY/mw2vU9amHrVlVRk=; b=HUiStRB0n5IH8Olzlv4zAvxorXpWEQ7dcIE4OX9zrvqC3NNQK3MP5rzby1fCRqrkOpRFlC zXzHtBqCNjFbgbV7hJPVEgfeUFZdfCk0+tpHhf8nRag3nVhrULYu0QdmdV5NvKvmDt6SeF lXOpNy0Au3b0GC6VrSwTI28ET6yKcxe8XYWx/wBBgKN/hGm3uPV+zjzVk67AqKxH8zRFDv QmXNuyUkkXuf00/OiEfo2WYqY2SWRnmev/M4kExHyNKcATpyLyALOfhz8mCHsQAnicOx0y xq6ZD3bzpXlG/1rEsbjnahS8EFKnp7LiAdx5d/T3MVU7blB3zw1eEcCyEBUFiw== 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 4Sl7ry0MFlz4nY; Tue, 5 Dec 2023 18:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IBTvt089498; Tue, 5 Dec 2023 18:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IBTrJ089495; Tue, 5 Dec 2023 18:11:29 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:11:29 GMT Message-Id: <202312051811.3B5IBTrJ089495@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 3c2b953b9cde - main - lang/gcc12: install ISO_Fortran_binding.h in a separate directory List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c2b953b9cde73c0d2770889cd83d66e707cdfeb Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c2b953b9cde73c0d2770889cd83d66e707cdfeb commit 3c2b953b9cde73c0d2770889cd83d66e707cdfeb Author: Thierry Thomas AuthorDate: 2023-11-28 21:12:45 +0000 Commit: Thierry Thomas CommitDate: 2023-12-05 18:11:27 +0000 lang/gcc12: install ISO_Fortran_binding.h in a separate directory ISO_Fortran_binding.h is sometimes needed for the support of Fortran 2018, e.g. MPICH must find it to build mpi_f08.mod. ATM it is installed in a directory depending on $CONFIGURE_TARGET with a complex path, and it is not possible to point CFLAGS towards this dir because other headers (like stdatomic.h) would conflict with those from the system. Therefore create a new directory /usr/local/include/gcc12 to install this header. PR: 275431 Approved by: salvadore@ (maintainer) --- lang/gcc12/Makefile | 6 +++++- lang/gcc12/pkg-plist | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile index 3f9cc6af03ad..b0fb1c05b78a 100644 --- a/lang/gcc12/Makefile +++ b/lang/gcc12/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 12.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} @@ -162,6 +162,10 @@ full-regression-test: build post-stage: ${RM} ${STAGEDIR}${PREFIX}/man/man7/* ${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ + # Install ISO_Fortran_binding.h in an easily findable directory + ${MKDIR} ${STAGEDIR}${PREFIX}/include/gcc${SUFFIX} + ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/lib/gcc${SUFFIX}/gcc/${CONFIGURE_TARGET}/${GCC_VERSION}/include/ISO_Fortran_binding.h \ + ${STAGEDIR}${PREFIX}/include/gcc${SUFFIX} # Add target libraries and include files to packaging list. ${RM} ${WRKDIR}/PLIST.lib diff --git a/lang/gcc12/pkg-plist b/lang/gcc12/pkg-plist index b9bd0e27dcef..e562f9ed4e63 100644 --- a/lang/gcc12/pkg-plist +++ b/lang/gcc12/pkg-plist @@ -18,6 +18,7 @@ bin/gcov-dump%%SUFFIX%% bin/gcov-tool%%SUFFIX%% bin/gfortran%%SUFFIX%% bin/lto-dump%%SUFFIX%% +include/gcc%%SUFFIX%%/ISO_Fortran_binding.h man/man1/cpp%%SUFFIX%%.1.gz man/man1/g++%%SUFFIX%%.1.gz man/man1/gcc%%SUFFIX%%.1.gz