Skip to content

Commit

Permalink
lang/gcc14-devel: Fix conflict on libgccjit.h and libgccjit++.h
Browse files Browse the repository at this point in the history
Some GCC ports install libgccjit.h and libgccjit++.h in the
same directory.

Fix conflict for lang/gcc14-devel.

See also commit 0338e04 that fixed the
conflict in the same way for lang/gcc11.

PR:		257060, 277383
  • Loading branch information
Ximalas authored and lsalvadore committed Apr 6, 2024
1 parent bb69289 commit c43b090
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 2 deletions.
1 change: 1 addition & 0 deletions lang/gcc14-devel/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gcc
PORTVERSION= 14.0.1.s20240331
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= lang
MASTER_SITES= GCC/snapshots/${DIST_VERSION}
Expand Down
19 changes: 19 additions & 0 deletions lang/gcc14-devel/files/patch-gcc_Makefile.in
@@ -0,0 +1,19 @@
--- gcc/Makefile.in.orig 2024-02-25 22:32:27 UTC
+++ gcc/Makefile.in
@@ -671,6 +671,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
@@ -3821,6 +3823,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)
14 changes: 14 additions & 0 deletions lang/gcc14-devel/files/patch-gcc_jit_Make-lang.in
@@ -0,0 +1,14 @@
--- gcc/jit/Make-lang.in.orig 2024-02-25 22:32:31 UTC
+++ gcc/jit/Make-lang.in
@@ -360,9 +360,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
2 changes: 0 additions & 2 deletions lang/gcc14-devel/pkg-plist
Expand Up @@ -19,8 +19,6 @@ bin/gcov-tool%%SUFFIX%%
bin/gfortran%%SUFFIX%%
bin/lto-dump%%SUFFIX%%
include/gcc%%SUFFIX%%/ISO_Fortran_binding.h
include/libgccjit++.h
include/libgccjit.h
share/man/man1/cpp%%SUFFIX%%.1.gz
share/man/man1/g++%%SUFFIX%%.1.gz
share/man/man1/gcc%%SUFFIX%%.1.gz
Expand Down

0 comments on commit c43b090

Please sign in to comment.