git: 3c2b953b9cde - main - lang/gcc12: install ISO_Fortran_binding.h in a separate directory

From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Tue, 05 Dec 2023 18:11:29 UTC
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c2b953b9cde73c0d2770889cd83d66e707cdfeb

commit 3c2b953b9cde73c0d2770889cd83d66e707cdfeb
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-11-28 21:12:45 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
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