Thu Jul 9 06:47:08 2020 UTC ()
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


(bsiegert)
diff -r1.25 -r1.25.2.1 pkgsrc/shells/fish/Makefile
cvs diff -r1.25 -r1.25.2.1 pkgsrc/shells/fish/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/fish/Makefile 2020/06/14 22:52:10 1.25
+++ pkgsrc/shells/fish/Makefile 2020/07/09 06:47:08 1.25.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2020/06/14 22:52:10 js Exp $ 1# $NetBSD: Makefile,v 1.25.2.1 2020/07/09 06:47:08 bsiegert Exp $
2 2
3DISTNAME= fish-3.1.2 3DISTNAME= fish-3.1.2
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= shells 5CATEGORIES= shells
6MASTER_SITES= ${MASTER_SITE_GITHUB:=fish-shell/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=fish-shell/}
7GITHUB_PROJECT= fish-shell 7GITHUB_PROJECT= fish-shell
8GITHUB_RELEASE= ${PKGVERSION_NOREV} 8GITHUB_RELEASE= ${PKGVERSION_NOREV}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fishshell.com/ 11HOMEPAGE= http://www.fishshell.com/
12COMMENT= User friendly command line shell for UNIX-like operating systems 12COMMENT= User friendly command line shell for UNIX-like operating systems
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -37,16 +37,19 @@ LDFLAGS+= -lexecinfo @@ -37,16 +37,19 @@ LDFLAGS+= -lexecinfo
37PLIST_VARS+= open realpath 37PLIST_VARS+= open realpath
38.if ${OPSYS} == "Darwin" 38.if ${OPSYS} == "Darwin"
39PLIST.realpath= yes 39PLIST.realpath= yes
40.else 40.else
41PLIST.open= yes 41PLIST.open= yes
42.endif 42.endif
43 43
44post-extract: 44post-extract:
45 ${RM} ${WRKSRC}/version 45 ${RM} ${WRKSRC}/version
46 46
47.include "../../devel/pcre2/buildlink3.mk" 47.include "../../devel/pcre2/buildlink3.mk"
48.include "../../devel/gettext-lib/buildlink3.mk" 48.include "../../devel/gettext-lib/buildlink3.mk"
49.include "../../devel/gettext-tools/buildlink3.mk" 49.include "../../devel/gettext-tools/buildlink3.mk"
 50.if !empty(PKGSRC_COMPILER:M*gcc*)
 51. include "../../devel/libatomic/buildlink3.mk"
 52.endif
50.include "../../lang/python/application.mk" 53.include "../../lang/python/application.mk"
51.include "../../mk/curses.buildlink3.mk" 54.include "../../mk/curses.buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"