From nobody Sat Apr 06 19:15:00 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBlRT0MrQz5H9qG; Sat, 6 Apr 2024 19:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBlRS3Ybfz4Dck; Sat, 6 Apr 2024 19:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712430900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zB/OhFrZYCaQRrejIV81tCU2fhxWF6Jvx6Ev+6dZU9M=; b=foH5R82K7WDrK+hdL/pb56oOc66vN9YXXaop3tQZdG1zyTvjNqNu+hCmvgib/OXn5IZRcz ajsCTJPYnupjv3nR5b2ek2DvBc1DweNYj1sZCkuNI9WLSBIwihZtc6pNZxpU8WMrD8g83Q XobHMVpd6lynS7V1kMGVoI/4Zc2GsX1hJ0xH4Z84bsNMLEA0jToPjihXnCcfBygHeIPyM6 PtKmrqim/1SzXBTnXxP/oEEqilCFhrbeCMqp4iYmnM3XCL6t4Qgkkrc8IxXkB+4kNTBUMR 6lxSEwx6zvqFToWK4Y3aFw9h9bfgk4wlVNJb5AyHlaQgZ/kbSJ4crScXs8d+nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712430900; a=rsa-sha256; cv=none; b=ndSm30fmW+7/lMs7zcjUICh1yaNPtRmyX8Hk9jzxbD8C7AfGgCeiRj2U4KBrJqBimsKkC5 VGijDqfm2Fg7rCGsmxK/cHvh2oQrtTra3+HKP1KgWJu6W/pPMtbKGQedcTmFiYi8RJhpYR i0nYQ307G0Gxl9lKi9bRnvWqB4HxMdAoa+xvFPbtnrQ08EQSvq0OwyV5YUEiKPgcRYp6j5 aQr3eg7dzzZwfiIdsDL0ZfEJZN6WMmMhsC4aJJ+D/7eGvcxZlBCTZZo+HOaFIk8BAxB95g wGpP37Tni/kj/0spKjwx7bXoY6tI0IESdo0CJoJ5BTiJ5fGN8nMr7ZRrhZQKTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712430900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zB/OhFrZYCaQRrejIV81tCU2fhxWF6Jvx6Ev+6dZU9M=; b=aK2sPqO9WnfIrmZwx3hJ9z+gcC/Ah8tDORM8xaCn7xAGgieiZ9zuUFp8ZmGSvqoE+Pb9CV PyoHvPhLJqC8BfXiBhZs36SccujblWqDnU8hKZ2Mph3rpwYaYzBNjwQsLxIFPjSQs2ak0c /kWmIXe130HhjBFqpnZWMsGeY4f4iRTrYCdAKgbJnORgwCnHFIi8F+QajjKz9y713ADY84 6lVwAhjrtTw0TcOBhsTfWi0fPBzQsdpRxqEUm99WhVEcaQlkC9A/ceumOFDGTg657jpRfD VWbeb4MRbSsgnq8zTTY2HSD3BddvLqFa7jF/m0W+kW8o/4sdkVnm5U3/CAbtLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBlRS37QLzvwy; Sat, 6 Apr 2024 19:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436JF0BU027590; Sat, 6 Apr 2024 19:15:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436JF0K9027587; Sat, 6 Apr 2024 19:15:00 GMT (envelope-from git) Date: Sat, 6 Apr 2024 19:15:00 GMT Message-Id: <202404061915.436JF0K9027587@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: c43b09081c53 - main - lang/gcc14-devel: Fix conflict on libgccjit.h and libgccjit++.h List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c43b09081c53651e478e226f77d25562852a8b8b Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=c43b09081c53651e478e226f77d25562852a8b8b commit c43b09081c53651e478e226f77d25562852a8b8b Author: Trond Endrestøl AuthorDate: 2024-04-06 12:44:39 +0000 Commit: Lorenzo Salvadore CommitDate: 2024-04-06 19:14:53 +0000 lang/gcc14-devel: Fix conflict on libgccjit.h and libgccjit++.h Some GCC ports install libgccjit.h and libgccjit++.h in the same directory. Fix conflict for lang/gcc14-devel. See also commit 0338e04504ee269b7a95e6707f1314bc1c4239fe that fixed the conflict in the same way for lang/gcc11. PR: 257060, 277383 --- lang/gcc14-devel/Makefile | 1 + lang/gcc14-devel/files/patch-gcc_Makefile.in | 19 +++++++++++++++++++ lang/gcc14-devel/files/patch-gcc_jit_Make-lang.in | 14 ++++++++++++++ lang/gcc14-devel/pkg-plist | 2 -- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/lang/gcc14-devel/Makefile b/lang/gcc14-devel/Makefile index 20caa11dce59..60562e38e9c0 100644 --- a/lang/gcc14-devel/Makefile +++ b/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} 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