CVS commit: pkgsrc/shells/fish

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Jan  6 04:22:15 UTC 2024

Modified Files:
        pkgsrc/shells/fish: Makefile

Log Message:
fish: fix link error with new binutils on NetBSD

cur_term comes from libterminfo and newer binutils doesn't side-load it
even though libcurses is linked with libterminfo

Not sure when this became a problem but without it, netbsd-current fails
to link fish.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/shells/fish/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.48 pkgsrc/shells/fish/Makefile:1.49
--- pkgsrc/shells/fish/Makefile:1.48    Mon Dec 11 09:37:12 2023
+++ pkgsrc/shells/fish/Makefile Sat Jan  6 04:22:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2023/12/11 09:37:12 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2024/01/06 04:22:15 maya Exp $
 
 DISTNAME=              fish-3.6.4
 CATEGORIES=            shells
@@ -28,6 +28,8 @@ CPPFLAGS+=            -DHAVE_BACKTRACE_SYMBOLS
 CXXFLAGS.NetBSD+=      -fpermissive
 LDFLAGS+=              -lexecinfo
 .endif
+# Needed for cur_term
+LDFLAGS.NetBSD+=       -lterminfo
 
 # Upstream intentionally omits open.1 on Darwin, but adds realpath.1
 PLIST_VARS+=   open realpath
@@ -54,6 +56,7 @@ post-extract:
 # ninja: error: manifest 'build.ninja' still dirty after 100 tries, perhaps system time is not set
 CMAKE_GENERATOR=       make
 
+.include "../../mk/terminfo.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../devel/pcre2/buildlink3.mk"