Attachment 249669 Details for Bug 277383 – Patch for lang/gcc14-devel moving libgccjit.h and libgccjit++.h out of the way

[patch] Patch for lang/gcc14-devel moving libgccjit.h and libgccjit++.h out of the way

lang___gcc14-devel.libgccjit.diff (text/plain), 2.82 KB, created by Trond Endrestøl on 2024-04-02 20:22:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Trond Endrestøl

Created: 2024-04-02 20:22:11 UTC

Size: 2.82 KB

patch

obsolete

>lang/gcc14-devel: apply the same modification that was done to lang/gcc12 in bug 257060.
>
>diff --git a/lang/gcc14-devel/Makefile b/lang/gcc14-devel/Makefile
>index 8a9dcc71df00..15849265439c 100644
>--- a/lang/gcc14-devel/Makefile
>+++ b/lang/gcc14-devel/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	gcc
> PORTVERSION=	14.0.1.s20240225
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	lang
> MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
>diff --git a/lang/gcc14-devel/files/patch-gcc_Makefile.in b/lang/gcc14-devel/files/patch-gcc_Makefile.in
>new file mode 100644
>index 000000000000..127c87b1af79
>--- /dev/null
>+++ b/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)
>diff --git a/lang/gcc14-devel/files/patch-gcc_jit_Make-lang.in b/lang/gcc14-devel/files/patch-gcc_jit_Make-lang.in
>new file mode 100644
>index 000000000000..d5fdd6103146
>--- /dev/null
>+++ b/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
>diff --git a/lang/gcc14-devel/pkg-plist b/lang/gcc14-devel/pkg-plist
>index c32d1546a63e..8dcc98c6dd52 100644
>--- a/lang/gcc14-devel/pkg-plist
>+++ b/lang/gcc14-devel/pkg-plist
>@@ -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

Actions: View | Diff

Attachments on bug 277383: 249669