From nobody Fri Nov 04 21:23:00 2022 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 4N3trj0Kdyz4gmSg; Fri, 4 Nov 2022 21:23: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 4N3trh6Zv1z3pGd; Fri, 4 Nov 2022 21:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667596980; 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=YUnhqU8j46UKVyfVOzI9sKZtuU2KMRv+5AFoBVBHGSY=; b=TyeQl2Yh7atO4gYtZyUEThErqR5Vr41dxIBUbjYzf/UvVU83aKVDn1v673m6+8qX8Bl8cW ECr3Ij/+UFYM/fICBRdyX0HMZCQm4Ht6Cjnf8OlMQasciTySFEtRxwHaAhZ5PUK0GaCqDX Ji072gvoLxx4ICxvm8Rz7EXDLLMHvwHKp7Nrw4Klf2a8UeSUq7tjbxevzZuvxJoKzCNxq3 aTHkeUt5WBpUqzA60OiUMYUMBfQWCcYzv9tfnwVYkoRJuXxf2dafd1ukL+zTwD4pGjSLu9 XD4HWXrhcagkvh4j7C9TRS15aN1qQmSjYr7YjNZNmgCHgO9BtGB5keE9USctwg== 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 4N3trh5bhXzH85; Fri, 4 Nov 2022 21:23:00 +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 2A4LN0Ll004130; Fri, 4 Nov 2022 21:23:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A4LN0xw004129; Fri, 4 Nov 2022 21:23:00 GMT (envelope-from git) Date: Fri, 4 Nov 2022 21:23:00 GMT Message-Id: <202211042123.2A4LN0xw004129@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: 9f0cd13014d0 - main - lang/gcc11: Revert "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: 9f0cd13014d0962aedfa016c86a5af07ca3ba814 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667596980; 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=YUnhqU8j46UKVyfVOzI9sKZtuU2KMRv+5AFoBVBHGSY=; b=ecCi53l5/s3WfxozN8KyZ/ngo6zsVy6UgWKg1bM0avhncmXs0H97v6m8lfKBexMVBg5bLd massRjJI+zHH9M58gzmIUJNCZdy4lb26oEYdwvG2rjUfIfTrKkPPmqJ/tkcT9U+XfN/wiu bXN9I3Tj0kuOfwOg2BI2sfXCwtHWIFCeX37WFf5+F/G+Vuxzb4rgkBYCzN7PmfrZf57Ink VPRmiC0IHJCBlcoiFKQd+pi4ewLpXZz4RsFXPp+8/5jamjkiOYUwqdXygGCh82okZlLU+L THVg3Jh6XjoQL51N2c6N0YuC/XPyh7lOHTYSSH/Gye8YBGoEv2SlAAr1HyBzSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667596980; a=rsa-sha256; cv=none; b=x/8qSOkT8RMP21wTVmkEHJLdLg09jTETX0Wi8GgR4NYsEfSgV0gQN5xHO+smCMM9RcXOx/ Vs3HXfxZx0VD0l1Np+1616km24lsySIxJqzgIUk+1czyxJj9Q3lV3bnFmZRa49NRoK00Vt ot3QAR+1JAHxBwKrJcefBN84PbTI7mfR5fDQvYD/5bJuqxO3q1gQQz6Nj5akWSrPt/vs+C hSUQSdtT+l1e577nvZcBEUfgef3Sv2WXoMpxdXSQSpetCFv9FSiupUgjRyjTGrFrrthYAV GkCVKT4P2Ipk8x0fI9l8UVkfy6/4fdNCguEFx0aup6LUiw5hDq7TpzqSbQD7Mg== 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=9f0cd13014d0962aedfa016c86a5af07ca3ba814 commit 9f0cd13014d0962aedfa016c86a5af07ca3ba814 Author: Lorenzo Salvadore AuthorDate: 2022-11-04 21:13:09 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-11-04 21:22:03 +0000 lang/gcc11: Revert "Fix conflict on libgccjit.h and libgccjit++.h" This reverts commit dc67e7d3009de2b78d96136c8ad09cf186e553df. The revert is necessary as - lang/gcc11/files/patch-gcc_Makefile.in was wrong: it should have used $(version) instead of $(gcc_version); - even after correcting the above mistake, the patch still does not work: lang/emacs fails to configure and hence to build. See also https://reviews.freebsd.org/D37266 . PR: 257060 Reported by: yasu --- 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, 3 insertions(+), 34 deletions(-) diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile index 70abb2e30e68..e88adb3c28c4 100644 --- a/lang/gcc11/Makefile +++ b/lang/gcc11/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 11.3.0 -PORTREVISION= 3 +PORTREVISION= 4 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 deleted file mode 100644 index 6d1d926a66ff..000000000000 --- a/lang/gcc11/files/patch-gcc_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index 85728a1cb0d0..000000000000 --- a/lang/gcc11/files/patch-gcc_jit_Make-lang.in +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 b55927fab0f9..86cafdfda739 100644 --- a/lang/gcc11/pkg-plist +++ b/lang/gcc11/pkg-plist @@ -20,6 +20,8 @@ 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