openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-05-31 06:51:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fish: updated to 4.7.1

Browse Source 
Update the build flags to the new spelling required by fish.

The groff directory no longer exists, and the manual pages are never
built, so there's no need to remove them.

The MIPS patch was cherry-picked from upstream and can be dropped.

Signed-off-by: David Adam <zanchey@ucc.gu.uwa.edu.au>
This commit is contained in:
David Adam
2026-05-10 02:41:06 +08:00
committed by Alexandru Ardelean
parent d7b891ddd0
commit 39f4c789ba
2 changed files with 5 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/fish/Makefile
+5 -7
View File
@@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fish PKG_NAME:=fish
PKG_VERSION:=4.1.2 PKG_VERSION:=4.7.1
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/fish-shell/fish-shell/releases/download/$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/fish-shell/fish-shell/releases/download/$(PKG_VERSION)
PKG_HASH:=52873934fc1ee21a1496e9f4521409013e540f77cbf29142a1b17ab93ffaafac PKG_HASH:=6f4d5b438a6338e3f5dcda19a28261e2ece7a9b7ff97686685e6abdc31dbb7df
PKG_MAINTAINER:=Curtis Jiang <jqqqqqqqqqq@gmail.com> PKG_MAINTAINER:=Curtis Jiang <jqqqqqqqqqq@gmail.com>
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only
@@ -49,8 +49,8 @@ define Package/fish/description
endef endef
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-DBUILD_DOCS=OFF \ -DWITH_DOCS=OFF \
-DWITH_GETTEXT=OFF \ -DWITH_MESSAGE_LOCALIZATION=OFF \
-DRust_CARGO_TARGET=$(RUSTC_TARGET_ARCH) \ -DRust_CARGO_TARGET=$(RUSTC_TARGET_ARCH) \
-DFISH_USE_SYSTEM_PCRE2=ON -DFISH_USE_SYSTEM_PCRE2=ON
@@ -69,8 +69,6 @@ define Package/fish/install
$(INSTALL_DIR) $(1)/usr/share/fish $(INSTALL_DIR) $(1)/usr/share/fish
$(CP) $(PKG_INSTALL_DIR)/usr/share/fish/* $(1)/usr/share/fish/ $(CP) $(PKG_INSTALL_DIR)/usr/share/fish/* $(1)/usr/share/fish/
rm -rf $(1)/usr/share/fish/groff
rm -rf $(1)/usr/share/fish/man
rm -rf $(1)/usr/share/fish/tools rm -rf $(1)/usr/share/fish/tools
endef endef
utils/fish/patches/010-mips.patch
-41
View File
@@ -1,41 +0,0 @@
From 41636c8e356afe5c79c7023d93e68e423204d099 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 17 Oct 2025 14:58:55 +0200
Subject: [PATCH] Fix build on Linux/MIPS
Fixes #11965
---
CHANGELOG.rst | 2 ++
src/signal.rs | 10 +++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -556,6 +556,8 @@ Other improvements
For distributors
----------------
+- Fixed build on MIPS machines (:issue:`11965`).
+- Fixed broken universal variables on Cygwin (:issue:`11948`).
fish has been ported to Rust. This means a significant change in dependencies, which are listed in the README. In short, Rust 1.70 or greater is required, and a C++ compiler is no longer needed (although a C compiler is still required, for some C glue code and the tests).
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -417,7 +417,15 @@ const SIGNAL_TABLE : &[LookupEntry] = &[
#[cfg(any(apple, bsd))]
signal_entry!(SIGINFO, SIGINFO_DESC),
- #[cfg(target_os = "linux")]
+ #[cfg(all(
+ target_os = "linux",
+ not(any(
+ target_arch = "mips",
+ target_arch = "mips32r6",
+ target_arch = "mips64",
+ target_arch = "mips64r6",
+ ))
+ ))]
signal_entry!(SIGSTKFLT, SIGSTKFLT_DESC),
#[cfg(target_os = "linux")]