diff options
| author | Lorenzo Salvadore <salvadore@FreeBSD.org> | 2022-11-09 09:05:08 +0000 |
|---|---|---|
| committer | Lorenzo Salvadore <salvadore@FreeBSD.org> | 2022-11-09 13:29:15 +0000 |
| commit | f1957296ed2dce8a09bb9582e9a5a715bf8b3d4d (patch) | |
| tree | 8dabc03175a24c286d7cbdfbfef2cce154f6aa0d /lang/gcc12 | |
| parent | 4d4c08ea1c9bbb758e51a59a25c617dc43a9c9d8 (diff) | |
| download | ports-f1957296ed2dce8a09bb9582e9a5a715bf8b3d4d.tar.gz ports-f1957296ed2dce8a09bb9582e9a5a715bf8b3d4d.zip | |
lang/gcc12: Fix conflict on libgccjit.h and libgccjit++.h
GCC 11, GCC 12 and GCC 13 install libgccjit.h and libgccjit++.h in the
same directory.
Fix conflict for lang/gcc12, which is soon to become GCC_DEFAULT, by
installing those files in a directory specific to GCC 12.
See also commit 0338e04504ee269b7a95e6707f1314bc1c4239fe that fixed the
conflict in the same way for lang/gcc11.
PR: 257060
Diffstat (limited to 'lang/gcc12')
| -rw-r--r-- | lang/gcc12/Makefile | 2 | ||||
| -rw-r--r-- | lang/gcc12/files/patch-gcc_Makefile.in | 19 | ||||
| -rw-r--r-- | lang/gcc12/files/patch-gcc_jit_Make-lang.in | 14 | ||||
| -rw-r--r-- | lang/gcc12/pkg-plist | 2 |
4 files changed, 34 insertions, 3 deletions
diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile index 3ff848d25fe9..529e2595718a 100644 --- a/lang/gcc12/Makefile +++ b/lang/gcc12/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 12.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} diff --git a/lang/gcc12/files/patch-gcc_Makefile.in b/lang/gcc12/files/patch-gcc_Makefile.in new file mode 100644 index 000000000000..4d25cf85abc7 --- /dev/null +++ b/lang/gcc12/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/gcc12/files/patch-gcc_jit_Make-lang.in b/lang/gcc12/files/patch-gcc_jit_Make-lang.in new file mode 100644 index 000000000000..85728a1cb0d0 --- /dev/null +++ b/lang/gcc12/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/gcc12/pkg-plist b/lang/gcc12/pkg-plist index cada193c9907..b9bd0e27dcef 100644 --- a/lang/gcc12/pkg-plist +++ b/lang/gcc12/pkg-plist @@ -18,8 +18,6 @@ bin/gcov-dump%%SUFFIX%% bin/gcov-tool%%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 |