Received: by mail.netbsd.org (Postfix, from userid 605) id 0402B84DED; Thu, 9 Jul 2020 06:47:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 80DB384DEA for ; Thu, 9 Jul 2020 06:47:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id lQuH2d7tHXx5 for ; Thu, 9 Jul 2020 06:47:09 +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 D292E84D28 for ; Thu, 9 Jul 2020 06:47:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CBE52FB28; Thu, 9 Jul 2020 06:47:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1594277228151290" MIME-Version: 1.0 Date: Thu, 9 Jul 2020 06:47:08 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2020Q2] pkgsrc/shells/fish To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20200709064708.CBE52FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1594277228151290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Thu Jul 9 06:47:08 UTC 2020 Modified Files: pkgsrc/shells/fish [pkgsrc-2020Q2]: Makefile Log Message: Pullup ticket #6265 - requested by nia shells/fish: build fix Revisions pulled up: - shells/fish/Makefile 1.26 --- Module Name: pkgsrc Committed By: nia Date: Tue Jul 7 09:00:34 UTC 2020 Modified Files: pkgsrc/shells/fish: Makefile Log Message: fish: Pull in libatomic with gcc for e.g. powerpc To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.2.1 pkgsrc/shells/fish/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1594277228151290 Content-Disposition: inline Content-Length: 823 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/shells/fish/Makefile diff -u pkgsrc/shells/fish/Makefile:1.25 pkgsrc/shells/fish/Makefile:1.25.2.1 --- pkgsrc/shells/fish/Makefile:1.25 Sun Jun 14 22:52:10 2020 +++ pkgsrc/shells/fish/Makefile Thu Jul 9 06:47:08 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2020/06/14 22:52:10 js Exp $ +# $NetBSD: Makefile,v 1.25.2.1 2020/07/09 06:47:08 bsiegert Exp $ DISTNAME= fish-3.1.2 PKGREVISION= 1 @@ -47,6 +47,9 @@ post-extract: .include "../../devel/pcre2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/gettext-tools/buildlink3.mk" +.if !empty(PKGSRC_COMPILER:M*gcc*) +. include "../../devel/libatomic/buildlink3.mk" +.endif .include "../../lang/python/application.mk" .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1594277228151290--