Received: by mail.netbsd.org (Postfix, from userid 605) id 011D784D26; Sun, 18 Sep 2022 13:37:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 31A4784D1C for ; Sun, 18 Sep 2022 13:37:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id cLiogsm_X3B5 for ; Sun, 18 Sep 2022 13:37:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 80AF384CDC for ; Sun, 18 Sep 2022 13:37:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7E197FA90; Sun, 18 Sep 2022 13:37:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1663508238120750" MIME-Version: 1.0 Date: Sun, 18 Sep 2022 13:37:18 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/textproc/hgrep To: pkgsrc-changes@NetBSD.org Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20220918133718.7E197FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1663508238120750 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Sun Sep 18 13:37:18 UTC 2022 Modified Files: pkgsrc/textproc/hgrep: Makefile Log Message: textproc/hgrep: use mk/atomic64.h. Also sneak in -latomic via BUILDLINK_TRANSFORM on powerpc platforms, cannot use LDFLAGS since it's cargo which invokes cc as linker, and cargo apparently does not respect passed LDFLAGS. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/hgrep/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1663508238120750 Content-Disposition: inline Content-Length: 896 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/hgrep/Makefile diff -u pkgsrc/textproc/hgrep/Makefile:1.11 pkgsrc/textproc/hgrep/Makefile:1.12 --- pkgsrc/textproc/hgrep/Makefile:1.11 Fri May 27 18:21:50 2022 +++ pkgsrc/textproc/hgrep/Makefile Sun Sep 18 13:37:18 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/05/27 18:21:50 pin Exp $ +# $NetBSD: Makefile,v 1.12 2022/09/18 13:37:18 he Exp $ DISTNAME= hgrep-0.2.6 CATEGORIES= textproc @@ -17,9 +17,15 @@ INSTALLATION_DIRS= bin CARGO_NO_DEFAULT_FEATURES= YES CARGO_FEATURES+= ripgrep syntect-printer +.if ${MACHINE_ARCH} == "powerpc" +# sneak in -latomic in the linker invocation +BUILDLINK_TRANSFORM+= l:execinfo:execinfo:atomic +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/target/release/hgrep \ ${DESTDIR}${PREFIX}/bin +.include "../../mk/atomic64.mk" .include "../../lang/rust/cargo.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1663508238120750--