From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B151C158042 for ; Sun, 27 Oct 2024 08:52:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E42F7E07EE; Sun, 27 Oct 2024 08:52:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C587DE07EE for ; Sun, 27 Oct 2024 08:52:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC69C34308A for ; Sun, 27 Oct 2024 08:52:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B198AE7 for ; Sun, 27 Oct 2024 08:51:59 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1730019114.ff4ad1ea09221b9cb6a9385f42fba9177934b6f5.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ats2/files/, dev-lang/ats2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ats2/ats2-0.4.2-r1.ebuild dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch X-VCS-Directories: dev-lang/ats2/files/ dev-lang/ats2/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: ff4ad1ea09221b9cb6a9385f42fba9177934b6f5 X-VCS-Branch: master Date: Sun, 27 Oct 2024 08:51:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c8ac920-d704-4118-913d-348f357874b6 X-Archives-Hash: 9fc01a0c0a48df4f35ce1cf0c32d2b26 commit: ff4ad1ea09221b9cb6a9385f42fba9177934b6f5 Author: Maciej Barć gentoo org> AuthorDate: Sun Oct 27 08:10:51 2024 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sun Oct 27 08:51:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff4ad1ea dev-lang/ats2: patch make sub-call; fix AR Closes: https://bugs.gentoo.org/942204 Closes: https://bugs.gentoo.org/942050 Closes: https://bugs.gentoo.org/923881 Signed-off-by: Maciej Barć gentoo.org> dev-lang/ats2/ats2-0.4.2-r1.ebuild | 11 ++++++----- dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dev-lang/ats2/ats2-0.4.2-r1.ebuild b/dev-lang/ats2/ats2-0.4.2-r1.ebuild index 48cf6674525b..1c0702352d71 100644 --- a/dev-lang/ats2/ats2-0.4.2-r1.ebuild +++ b/dev-lang/ats2/ats2-0.4.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit elisp-common flag-o-matic toolchain-funcs +inherit elisp-common toolchain-funcs DESCRIPTION="Functional programming language with dependent types" HOMEPAGE="https://www.cs.bu.edu/~hwxi/atslangweb/ @@ -61,14 +61,15 @@ src_prepare() { -e "s|ar -r|$(tc-getAR) ${ARFLAGS} -r|g" \ || die + sed -i contrib/CATS-atscc2js/Makefile \ + -i src/CBOOT/Makefile \ + -e "/^AR=/s|ar|$(tc-getAR) ${ARFLAGS}|" \ + || die + rm utils/emacs/flycheck-ats2.el || die } src_compile() { - # Not really accurate but need Makefile investigation and patches. - # See: https://bugs.gentoo.org/941105 and https://bugs.gentoo.org/923881 - filter-lto - emake -j1 CC="$(tc-getCC)" GCC="$(tc-getCC)" CCOMP="$(tc-getCC)" all if use emacs ; then diff --git a/dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch b/dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch index ce24f44d32fc..94eb787121b7 100644 --- a/dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch +++ b/dev-lang/ats2/files/ats2-0.4.2-makefile_dist.patch @@ -11,3 +11,14 @@ ###### # +--- a/Makefile_dist ++++ b/Makefile_dist +@@ -78,7 +78,7 @@ LDFLAGS= + # + src2_patsopt: ; \ + $(MAKEJ4) -C src/CBOOT patsopt \ +-CCOMP=$(CCOMP) GCFLAG=$(GCFLAG) LDFLAGS=$(LDFLAGS) ++CCOMP="$(CCOMP)" GCFLAG="$(GCFLAG)" LDFLAGS="$(LDFLAGS)" + # + bin2_patsopt: src2_patsopt ; $(CPF) src/CBOOT/patsopt bin/patsopt + #