CVS commit: pkgsrc/shells/fish

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed Dec 17 19:05:30 UTC 2025

Modified Files:
        pkgsrc/shells/fish: Makefile distinfo
Added Files:
        pkgsrc/shells/fish/patches: patch-CMakeLists.txt patch-cmake_Rust.cmake

Log Message:
shells/fish: fix dynamic linking with pcre2


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/shells/fish/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/fish/patches/patch-cmake_Rust.cmake

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.58 pkgsrc/shells/fish/Makefile:1.59
--- pkgsrc/shells/fish/Makefile:1.58    Mon Dec 15 20:58:44 2025
+++ pkgsrc/shells/fish/Makefile Wed Dec 17 19:05:30 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2025/12/15 20:58:44 vins Exp $
+# $NetBSD: Makefile,v 1.59 2025/12/17 19:05:30 vins Exp $
 
 DISTNAME=      fish-4.2.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fish-shell/}
 GITHUB_PROJECT=        fish-shell
@@ -35,17 +35,16 @@ PKG_SHELL=          bin/fish
 
 REPLACE_PYTHON+=       share/tools/*.py
 
-PKGSRC_MAKE_ENV+=      FISH_BUILD_VERSION=${PKGVERSION_NOREV}
-
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DFISH_USE_SYSTEM_PCRE2=ON
 CMAKE_CONFIGURE_ARGS+= -DWITH_GETTEXT=ON
 CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
 
-# Disable dynamic linking of fish shell with system pcre2.
-# Somehow CMAKE_INSTALL_RPATH doesn't work and fish ends up with
-# missing shared objects.
-CMAKE_CONFIGURE_ARGS+= -DFISH_USE_SYSTEM_PCRE2=OFF
-#CMAKE_CONFIGURE_ARGS+=        -DCMAKE_INSTALL_RPATH=${BUILDLINK_PREFIX.pcre2}/lib
+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}
 
 TEST_TARGET=           fish_run_tests
 TEST_DEPENDS+=         ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.40 pkgsrc/shells/fish/distinfo:1.41
--- pkgsrc/shells/fish/distinfo:1.40    Sun Dec 14 22:08:37 2025
+++ pkgsrc/shells/fish/distinfo Wed Dec 17 19:05:30 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2025/12/14 22:08:37 vins Exp $
+$NetBSD: distinfo,v 1.41 2025/12/17 19:05:30 vins Exp $
 
 BLAKE2s (0.2.9-utf32.tar.gz) = 52de08088cc288e5fd826066d3105a3826b524b4acfbd1a2afb45e2b8cdd2c12
 SHA512 (0.2.9-utf32.tar.gz) = d00577beee02edf3f35c4371e9a7fb35a2ed9225cd5bc4e539b6a2cd1f31f2a3c55a91832f3310afdeb004e4c59f24aa06c72c2e31ce1827d349b058a7a91a3c
@@ -309,9 +309,11 @@ Size (windows-sys-0.61.2.crate) = 251718
 BLAKE2s (wit-bindgen-0.46.0.crate) = a4e3802e4182ff90b146fa8f8cfda0955eb91f42c0e5c58e1e8eaef3c755c75b
 SHA512 (wit-bindgen-0.46.0.crate) = 5d37ac5855797cfb906c983a70780d7cd29d70c4e5b6e54328fc18297feeb89ceda0aa732123280a12610015fbdb42bcd76aae12b1debb281b0a848016134548
 Size (wit-bindgen-0.46.0.crate) = 60508 bytes
+SHA1 (patch-CMakeLists.txt) = 1dbda3cd615afa10b42c16a0ab756830b1a251e8
 SHA1 (patch-Cargo.toml) = da9c54ccad77851725b6d0121252efc115d1653f
 SHA1 (patch-build.rs) = 875746d4569a62e6252bc6a79e72bc08d6a40a1e
 SHA1 (patch-cmake_Install.cmake) = 36f3074f7aa5ded118a2fe0182c35bfb013b58f2
+SHA1 (patch-cmake_Rust.cmake) = ee255662ffd36e1c5bc91093aba47b778d713b36
 SHA1 (patch-src_builtins_ulimit.rs) = 67fc3122f4c0e8b6a7c46185c41ca97dc6049a11
 SHA1 (patch-src_fork__exec_spawn.rs) = 1f71fe537f00bfb7dd646389ce0f66c3d752cf30
 SHA1 (patch-src_path.rs) = cbe8c4666dcbe5e0b54d5053902b6de8b88ab67f

Added files:

Index: pkgsrc/shells/fish/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/shells/fish/patches/patch-CMakeLists.txt:1.3
--- /dev/null   Wed Dec 17 19:05:30 2025
+++ pkgsrc/shells/fish/patches/patch-CMakeLists.txt     Wed Dec 17 19:05:30 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/12/17 19:05:30 vins Exp $
+
+Do not override RUSTFLAGS.
+
+--- CMakeLists.txt.orig        2025-12-17 17:42:36.391428697 +0000
++++ CMakeLists.txt
+@@ -42,7 +42,6 @@ set(VARS_FOR_CARGO
+     "CARGO_TARGET_DIR=${FISH_RUST_BUILD_DIR}"
+     "CARGO_BUILD_RUSTC=${Rust_COMPILER}"
+     "${FISH_PCRE2_BUILDFLAG}"
+-    "RUSTFLAGS=$ENV{RUSTFLAGS} ${rust_debugflags}"
+     "FISH_SPHINX=${SPHINX_EXECUTABLE}"
+     "FISH_USE_PREBUILT_DOCS=${USE_PREBUILT_DOCS}"
+ )

Index: pkgsrc/shells/fish/patches/patch-cmake_Rust.cmake
diff -u /dev/null pkgsrc/shells/fish/patches/patch-cmake_Rust.cmake:1.1
--- /dev/null   Wed Dec 17 19:05:30 2025
+++ pkgsrc/shells/fish/patches/patch-cmake_Rust.cmake   Wed Dec 17 19:05:30 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-cmake_Rust.cmake,v 1.1 2025/12/17 19:05:30 vins Exp $
+
+Do not override RUSTFLAGS.
+
+--- cmake/Rust.cmake.orig      2025-12-17 17:43:49.382254484 +0000
++++ cmake/Rust.cmake
+@@ -21,7 +21,6 @@ else()
+ endif()
+ 
+ set(rust_profile $<IF:$<CONFIG:Debug>,debug,$<IF:$<CONFIG:RelWithDebInfo>,release-with-debug,release>>)
+-set(rust_debugflags "$<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g>")
+ 
+ option(WITH_GETTEXT "Build with gettext localization support. Requires `msgfmt` to work." ON)
+ # Enable gettext feature unless explicitly disabled.