From nobody Sun Nov 06 15:16:24 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 4N4ycn20wvz4hPXP; Sun, 6 Nov 2022 15:16:25 +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 4N4ycn1BJYz3b8p; Sun, 6 Nov 2022 15:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667747785; 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=XiLAvybEpn9VFg+CN2A1RvTCTUyBJpOh6JwOYMO6QIU=; b=qeYgeUWcS+/lUWpNAoWxPjkhsJpYu9EIG7wbJnSasLohj9q6+nphC3+vi0Ymbh4hpF37f5 Fc9oyxLeewAnZ96K8YPXb2NOCS74QgtQ/rUoU29GXFeLzAm3bZ8DvQ9p0uj9y0O2GK2x5i 6DH9GQhlxhHQxH0EuB9A5pJP0SfsxLF+rcXwnmf4fPQL++I5UYmGQaEUZpszwCeCP+OVHW c6vsYFBX/TWQJQ4Ft4fjlt/lkuk0nFmoBcRXKijeOJkDv2P0fnQiXzqMFlY1vQDfJSJcu+ lPA5FZtP8e/6PW16GL7VdJTB9VnsE/J8+ZHcrtlt83JdB9IlzmxXxz1IO7owKA== 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 4N4ycn09WNzQVR; Sun, 6 Nov 2022 15:16:25 +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 2A6FGOtG054642; Sun, 6 Nov 2022 15:16:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6FGOed054641; Sun, 6 Nov 2022 15:16:24 GMT (envelope-from git) Date: Sun, 6 Nov 2022 15:16:24 GMT Message-Id: <202211061516.2A6FGOed054641@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: 0338e04504ee - main - lang/gcc11: Fix conflict on libgccjit.h and libgccjit++.h again 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: 0338e04504ee269b7a95e6707f1314bc1c4239fe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667747785; 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=XiLAvybEpn9VFg+CN2A1RvTCTUyBJpOh6JwOYMO6QIU=; b=ZXOPEqLO922weN8bdT5ncihKl+z5qh86/65wOb0gGvZzHiOnE1+EvMRXnrwfsrouswuke9 Nybb1yBX/yV3t980BDqbkMC/mU4wXEQE1zu951JNCjiQz2wuCjuPpSMk3YRX1dJPPYfLtV T5nGCGetS4GEDwLV2JQHcsdgC7nWhzDR3t8Y4c4Dt+KmC+LiQekgL0M8hC7C/aiG0GssYx bd+8rJrr2Gq0HUPX1s2jUvwp6b5pRar6JBCgxqi/m62oPLJgUzL3QTFq8Ik4tnWgF3NrhV aSUn3zc/lLa3jOdEIKBYrbE9dcwspUhnELwzhezzlQ8d8vbt5goPQJ0EdIV6Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667747785; a=rsa-sha256; cv=none; b=N7dO39kTVXIfX5mecP79KZ1HTtTIIjaPszbJ4jLiwNPe/fYuT2EelsCdvtLBdPDwFulgz5 O7XUSHHglKiJnoJe57CmhkYWneTlklxqcSHmTk3T/pC4/T62aa21MrFk67cXOE0NSuH3IP 5RWinQHj0koBR76O4nWiS/N7RvkebS9KFGgfwRYLRqTxv6/fJrD7cBqaZS6gITEHRSFPLr JmCup/+64rW9kDSTebXboLTOft3E47uCbSG+u1LqVIEiDrpPVFq7oD2V/BFeXXzaFw+g3V 5fNezBrYQjKVJoQ8unbDoMBDmtQe2pjhkdbfwgZCTiw9JyQ1zMpPYcwyo4Cnew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=0338e04504ee269b7a95e6707f1314bc1c4239fe commit 0338e04504ee269b7a95e6707f1314bc1c4239fe Author: Lorenzo Salvadore AuthorDate: 2022-11-05 07:55:32 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-11-06 15:15:54 +0000 lang/gcc11: Fix conflict on libgccjit.h and libgccjit++.h again This is the second attempt to solve the conflict, see commits - dc67e7d3009de2b78d96136c8ad09cf186e553df (first attempt); - 9f0cd13014d0962aedfa016c86a5af07ca3ba814 (revert of the first attempt). GCC 11, GCC 12 and GCC 13 install libgccjit.h and libgccjit++.h in the same directory. Fix conflict for GCC 11, which is GCC_DEFAULT, by installing those files in a directory specific to GCC 11. PR: 257060 Reviewed by: yasu, jrm Differential Revision: https://reviews.freebsd.org/D37266 --- lang/gcc11/Makefile | 2 +- lang/gcc11/files/patch-gcc_Makefile.in | 19 +++++++++++++++++++ lang/gcc11/files/patch-gcc_jit_Make-lang.in | 14 ++++++++++++++ lang/gcc11/pkg-plist | 2 -- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile index e88adb3c28c4..ec35a1af488a 100644 --- a/lang/gcc11/Makefile +++ b/lang/gcc11/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 11.3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} diff --git a/lang/gcc11/files/patch-gcc_Makefile.in b/lang/gcc11/files/patch-gcc_Makefile.in new file mode 100644 index 000000000000..4d25cf85abc7 --- /dev/null +++ b/lang/gcc11/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/gcc11/files/patch-gcc_jit_Make-lang.in b/lang/gcc11/files/patch-gcc_jit_Make-lang.in new file mode 100644 index 000000000000..85728a1cb0d0 --- /dev/null +++ b/lang/gcc11/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/gcc11/pkg-plist b/lang/gcc11/pkg-plist index 86cafdfda739..b55927fab0f9 100644 --- a/lang/gcc11/pkg-plist +++ b/lang/gcc11/pkg-plist @@ -20,8 +20,6 @@ bin/gcov-tool%%SUFFIX%% bin/gdc%%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