git: 0338e04504ee - main - lang/gcc11: Fix conflict on libgccjit.h and libgccjit++.h again

The branch main has been updated by salvadore:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0338e04504ee269b7a95e6707f1314bc1c4239fe

commit 0338e04504ee269b7a95e6707f1314bc1c4239fe
Author:     Lorenzo Salvadore <salvadore@FreeBSD.org>
AuthorDate: 2022-11-05 07:55:32 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2022-11-06 15:15:54 +0000

    lang/gcc11: Fix conflict on libgccjit.h and libgccjit++.h again
    
    This is the second attempt to solve the conflict, see commits
    - dc67e7d3009de2b78d96136c8ad09cf186e553df (first attempt);
    - 9f0cd13014d0962aedfa016c86a5af07ca3ba814 (revert of the first
      attempt).
    
    GCC 11, GCC 12 and GCC 13 install libgccjit.h and libgccjit++.h in the
    same directory.
    
    Fix conflict for GCC 11, which is GCC_DEFAULT, by installing those files
    in a directory specific to GCC 11.
    
    PR:             257060
    Reviewed by:    yasu, jrm
    Differential Revision:  https://reviews.freebsd.org/D37266
---
 lang/gcc11/Makefile                         |  2 +-
 lang/gcc11/files/patch-gcc_Makefile.in      | 19 +++++++++++++++++++
 lang/gcc11/files/patch-gcc_jit_Make-lang.in | 14 ++++++++++++++
 lang/gcc11/pkg-plist                        |  2 --
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile
index e88adb3c28c4..ec35a1af488a 100644
--- a/lang/gcc11/Makefile
+++ b/lang/gcc11/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gcc
 PORTVERSION=	11.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
diff --git a/lang/gcc11/files/patch-gcc_Makefile.in b/lang/gcc11/files/patch-gcc_Makefile.in
new file mode 100644
index 000000000000..4d25cf85abc7
--- /dev/null
+++ b/lang/gcc11/files/patch-gcc_Makefile.in
@@ -0,0 +1,19 @@
+--- gcc/Makefile.in.orig	2022-11-02 20:13:34 UTC
++++ gcc/Makefile.in
+@@ -630,6 +630,8 @@ libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/
+ 
+ # Directory in which the compiler finds libraries etc.
+ libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
++# Directory in which the compiler finds headers.
++libsubincludedir = $(libdir)/gcc/$(target_alias)/$(version)/include
+ # Directory in which the compiler finds executables
+ libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
+ # Directory in which all plugin resources are installed
+@@ -3609,6 +3611,7 @@ installdirs:
+ # $(libdir)/gcc/include isn't currently searched by cpp.
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(libsubdir)
++	$(mkinstalldirs) $(DESTDIR)$(libsubincludedir)
+ 	$(mkinstalldirs) $(DESTDIR)$(libexecsubdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	$(mkinstalldirs) $(DESTDIR)$(includedir)
diff --git a/lang/gcc11/files/patch-gcc_jit_Make-lang.in b/lang/gcc11/files/patch-gcc_jit_Make-lang.in
new file mode 100644
index 000000000000..85728a1cb0d0
--- /dev/null
+++ b/lang/gcc11/files/patch-gcc_jit_Make-lang.in
@@ -0,0 +1,14 @@
+--- gcc/jit/Make-lang.in.orig	2022-11-02 17:25:43 UTC
++++ gcc/jit/Make-lang.in
+@@ -355,9 +355,9 @@ jit.install-headers: installdirs
+ # Install hooks:
+ jit.install-headers: installdirs
+ 	$(INSTALL_DATA) $(srcdir)/jit/libgccjit.h \
+-	  $(DESTDIR)$(includedir)/libgccjit.h
++	  $(DESTDIR)$(libsubincludedir)/libgccjit.h
+ 	$(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
+-	  $(DESTDIR)$(includedir)/libgccjit++.h
++	  $(DESTDIR)$(libsubincludedir)/libgccjit++.h
+ 
+ ifneq (,$(findstring mingw,$(target)))
+ jit.install-common: installdirs jit.install-headers
diff --git a/lang/gcc11/pkg-plist b/lang/gcc11/pkg-plist
index 86cafdfda739..b55927fab0f9 100644
--- a/lang/gcc11/pkg-plist
+++ b/lang/gcc11/pkg-plist
@@ -20,8 +20,6 @@ bin/gcov-tool%%SUFFIX%%
 bin/gdc%%SUFFIX%%
 bin/gfortran%%SUFFIX%%
 bin/lto-dump%%SUFFIX%%
-include/libgccjit++.h
-include/libgccjit.h
 man/man1/cpp%%SUFFIX%%.1.gz
 man/man1/g++%%SUFFIX%%.1.gz
 man/man1/gcc%%SUFFIX%%.1.gz