Received: by mail.netbsd.org (Postfix, from userid 605) id 030F384FD8; Sat, 6 Jan 2024 04:22:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 34CD584E5B for ; Sat, 6 Jan 2024 04:22:17 +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 PJ5oh73RlDTA for ; Sat, 6 Jan 2024 04:22:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7E58D84D39 for ; Sat, 6 Jan 2024 04:22:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F137CFA42; Sat, 6 Jan 2024 04:22:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1704514935299600" MIME-Version: 1.0 Date: Sat, 6 Jan 2024 04:22:15 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/shells/fish To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20240106042215.F137CFA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1704514935299600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1704514935299600 Content-Disposition: inline Content-Length: 1021 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.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" --_----------=_1704514935299600--