Attachment 246666 Details for Bug 275431 – lang/gcc12: install ISO_Fortran_binding.h in a separate directory

[patch] lang/gcc12: install ISO_Fortran_binding.h in a separate directory

lang_gcc12.diff (text/plain), 2.00 KB, created by Thierry Thomas on 2023-11-29 17:46:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2023-11-29 17:46:19 UTC

Size: 2.00 KB

patch

obsolete

>From dac53a43f076552b35f66bd3f10f55c938d13389 Mon Sep 17 00:00:00 2001
>From: Thierry Thomas <thierry@FreeBSD.org>
>Date: Tue, 28 Nov 2023 22:12:45 +0100
>Subject: [PATCH 1/2] 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.
>---
> 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
>-- 
>2.42.1
>

Flags:

salvadore: maintainer-approval+

Actions: View | Diff

Attachments on bug 275431: 246666 | 246667