From nobody Thu Nov 03 12:29:50 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 4N333y54qkz4gtX8; Thu, 3 Nov 2022 12:29:50 +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 4N333y4cgXz3RtT; Thu, 3 Nov 2022 12:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667478590; 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=yRQ7E3af2MeTI4e3vdIJPxcZ7ae8hewkKZmWK9NdVAI=; b=EIxVKomGEkCLV0MIW5OlTlnLeonU/M73hHdLuslVcWbvttVenEUCfnt5vCA6Fq5DAW+mkn IVqEVvOU8y0y+0Qe6U1jLCuv1hhEAr+E+5cITNKMUXo51e/5xCpPjZ3t+SSo81SN+pyeO1 tRT6z8wnDsOP1LmvOZcePwXmnR/2DBPQRkyEWvLnELxqXJl9s5KGin2wfQf0QPn1N18rgC 4sRI3AkaTaEPRCo1u7nCl13BKn4WXbLuRZm6j/bSPadWtXXnPSWCxa9PoM0J3//GAPaCrP /XK2VyoOgNLWHL4z/U4h4s5O+FcS6IiMdJTM2uWkVy7DMKS434bKFXmYr9Sy/Q== 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 4N333y3Yl7zc2F; Thu, 3 Nov 2022 12:29:50 +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 2A3CTowg005791; Thu, 3 Nov 2022 12:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A3CToIj005790; Thu, 3 Nov 2022 12:29:50 GMT (envelope-from git) Date: Thu, 3 Nov 2022 12:29:50 GMT Message-Id: <202211031229.2A3CToIj005790@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: dc67e7d3009d - main - lang/gcc11: Fix conflict on libgccjit.h and libgccjig++.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: dc67e7d3009de2b78d96136c8ad09cf186e553df Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667478590; 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=yRQ7E3af2MeTI4e3vdIJPxcZ7ae8hewkKZmWK9NdVAI=; b=KexxqKpyAO2Licp+ZtmZo8x6PM/MdwYek49UJcq9nk8OJE1xG59fCPuP1oVVAFpT7yV4Uf PrepkSzdtNhsELI50a/VvLRtGXJA++0ic45lfjH9oaxO+Ijr0tu2tC4a4rYqDYTkQOkG74 YvGzmQLXZ9NIJ1oiWZVDzWqJeeyqU3kLXDvbv1+DEZ+36CzJsxfXWMj1hDtZB97gp7i+6a QT3AkNHBNGljx8DwX32icNh4g+Iswb/6YFnDDWM2TDCZxviYi9pu61RCO+xm/i/lAuMzic JCSSeRMpwd/PTqbbSaxAMQyAVSPe6cErQvsPZ5EbFrDQRk3Q54IhuY3PHgT79w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667478590; a=rsa-sha256; cv=none; b=qc1dL3yZWQjQlwsTxtzGZm4zPqMfQJZPURsMIVG8rWAcnD9qrtjPw9/Lmd0Vovfbkyug3x cv8hQXtfn1385FblsUKqaHQB0qkZDKbAvGVmnecHJGOau49tvM+R3GySfb/KM+xW54BqjD mrroedzHjxcg7Nq+Owip6sKJ9KXkZoKdZRw6AkS42cCAetbEIMgTz3Ok08cal3H3ennN7w sR9AN9rtLlx3FEGJzWaY7ddw4PFmKfp0gw4BjQmsYLb4IYjfFit8rkIF5M1NB2L79V+kZq cB1QJL4xvpQzqFixkK5DGOc/f56Cf3Aqf38SXrBvZhS6KqKmJoaBi3CkIJ5bVw== 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=dc67e7d3009de2b78d96136c8ad09cf186e553df commit dc67e7d3009de2b78d96136c8ad09cf186e553df Author: Lorenzo Salvadore AuthorDate: 2022-11-02 22:24:57 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-11-03 12:29:06 +0000 lang/gcc11: Fix conflict on libgccjit.h and libgccjig++.h 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 Reported by: Ting-Wei Lan Reviewed by: gerald, dim Differential Revision: https://reviews.freebsd.org/D37242 See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101491 --- 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 50daf6cc11f2..70abb2e30e68 100644 --- a/lang/gcc11/Makefile +++ b/lang/gcc11/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 11.3.0 -PORTREVISION= 2 +PORTREVISION= 3 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..6d1d926a66ff --- /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)/$(gcc_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