From nobody Wed Nov 09 13:29:27 2022 X-Original-To: dev-commits-ports-all@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 4N6m5z45x7z4V2HG; Wed, 9 Nov 2022 13:29:27 +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 4N6m5z3YX2z45ym; Wed, 9 Nov 2022 13:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668000567; 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=G1b3bxxlSGFBvl9PPeV+i6pgQ0lKlWj8WI4zAcqgUi4=; b=vaTPnxvJvbVxJe0D4HGkh9ibnt0lmxfZL2gb/7cGQLMHmO2AC5pE3Bcd+XHbNZiy3NJPA7 EGPUWj1eRPVn6Biqdf9if6rZgPZypfYfqNmj6RAlpJ7b9+fBiLlTUBgwoF5EjiPBfT+T8U s8HGZn49rgTaQz4N2LhqpJD90UGQtpwRFZRJokIBtA+P/todZYFW5yBpPncusQ4pzo148+ vO9DsbonKYyt96jA4q8T3xeG5vVTVSIYPwKGNQ276p1fVhytRa342llR1YCYALOgr3Kr21 KEJYHd1DIaT9BV96xL8uQXXrAfacR9S/ltEiLGVO/cug/Becc2vNed9W4zEvbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668000567; 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=G1b3bxxlSGFBvl9PPeV+i6pgQ0lKlWj8WI4zAcqgUi4=; b=NGSiBdKfhTA+2Mu2bABPo0vZ8x2RgwDl/Sxwn4F2rq4hCpm/GKu11PODweUMMKe7LIVuE+ aWQVl1LAna3d3uH4WS8KGYj3kg9qDmayZfEh2xsbohieF9OAI3ioDeHoMUex30dqCW9UT+ 9PiEEe6soh733E/C+/hBXicjSO++LRbpxlZZQJTqJcWT5b3zJZQ4Ub1cetcN45uLi5xeBd LUtN6hP2XZRgJWOclvlxTWvr3R6f/UapyrOTJN+cCEVvediFwKSsNLOGQUZUCeKcGCOSSG OVXiWst9E4nVPT5WQvh6+I6XMcEaUsdJQcV9W9e7rUc+Xp55hzSXW01GLqw06Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668000567; a=rsa-sha256; cv=none; b=f4sempgJ/p/QsdSROoY2nL4dCeP0viGyQhvSKV+rsgmiagsKXrM2KC2AnqxxZjhoYcER08 Roq2FYcleXF1oRpl8aq44wzgu1F4bwczdhb92oq/d0ZznadgXA1XeXQkkeBu7+5RURUhAv 3WnoJ3tt9WUxWOxopwWew0gE5NBVNeOnpFBmuoK0gmpXv47smJ/QfvKKn4mSCHbaOnUhh3 63BE04a5s/NS6QCctWaycB4p5yjcfA6gqECZONmtZBrM5h0L13gBZy8YWFfM27SfYMhgQt ECIxO/1w6FzOPDkW5a7vQYa3sl+Osn7Tmfn+b/6Z+yawPklyHeTEJaCW05F7LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N6m5z2M28zN86; Wed, 9 Nov 2022 13:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A9DTRMM060708; Wed, 9 Nov 2022 13:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9DTR6U060707; Wed, 9 Nov 2022 13:29:27 GMT (envelope-from git) Date: Wed, 9 Nov 2022 13:29:27 GMT Message-Id: <202211091329.2A9DTR6U060707@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: f1957296ed2d - main - lang/gcc12: Fix conflict on libgccjit.h and libgccjit++.h List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: f1957296ed2dce8a09bb9582e9a5a715bf8b3d4d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1957296ed2dce8a09bb9582e9a5a715bf8b3d4d commit f1957296ed2dce8a09bb9582e9a5a715bf8b3d4d Author: Lorenzo Salvadore AuthorDate: 2022-11-09 09:05:08 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-11-09 13:29:15 +0000 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 --- lang/gcc12/Makefile | 2 +- lang/gcc12/files/patch-gcc_Makefile.in | 19 +++++++++++++++++++ lang/gcc12/files/patch-gcc_jit_Make-lang.in | 14 ++++++++++++++ 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