CVS commit: pkgsrc/shells/fish

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Dec 18 19:31:11 UTC 2025

Modified Files:
        pkgsrc/shells/fish: Makefile

Log Message:
fish: partially revert last commit

Switch back to static pcre2, otherwise we can't safely build fish.
See https://mail-index.netbsd.org/tech-pkg/2025/12/18/msg031792.html


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 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.59 pkgsrc/shells/fish/Makefile:1.60
--- pkgsrc/shells/fish/Makefile:1.59    Wed Dec 17 19:05:30 2025
+++ pkgsrc/shells/fish/Makefile Thu Dec 18 19:31:11 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2025/12/17 19:05:30 vins Exp $
+# $NetBSD: Makefile,v 1.60 2025/12/18 19:31:11 vins Exp $
 
 DISTNAME=      fish-4.2.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fish-shell/}
 GITHUB_PROJECT=        fish-shell
@@ -35,16 +35,18 @@ PKG_SHELL=          bin/fish
 
 REPLACE_PYTHON+=       share/tools/*.py
 
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
-CMAKE_CONFIGURE_ARGS+= -DFISH_USE_SYSTEM_PCRE2=ON
+# Disable dynamic linking with pcre2 to prevent missing dshare objects.
+# See https://mail-index.netbsd.org/tech-pkg/2025/12/15/msg031761.html
+CMAKE_CONFIGURE_ARGS+= -DFISH_USE_SYSTEM_PCRE2=OFF
 CMAKE_CONFIGURE_ARGS+= -DWITH_GETTEXT=ON
 CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
 
 RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre2}/lib
 RUSTFLAGS+=            -C link-arg=-L${BUILDLINK_PREFIX.pcre2}/lib
 
-PKGSRC_MAKE_ENV+=      FISH_BUILD_VERSION=${PKGVERSION_NOREV} \
-                       RUSTFLAGS=${RUSTFLAGS:M*:Q}
+PKGSRC_MAKE_ENV+=      FISH_BUILD_VERSION=${PKGVERSION_NOREV}
 
 TEST_TARGET=           fish_run_tests
 TEST_DEPENDS+=         ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect