From f3ce5985506842ff2b0476e52c7cd672a3062a9b Mon Sep 17 00:00:00 2001
From: mm644706215 <ze.ga@qq.com>
Date: Fri, 20 Mar 2026 21:52:40 +0800
Subject: [PATCH] Use libstdcpp in packaging metadata

---
 Makefile                              | 2 +-
 scripts/build_ipk.sh                  | 2 +-
 scripts/build_run.sh                  | 4 ++--
 tests/test_node_packaging_contract.sh | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 921c665..a489db0 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ PKG_MAINTAINER:=10000ge10000 <10000ge10000@users.noreply.github.com>
 PKG_LICENSE:=GPL-3.0
 
 LUCI_TITLE:=OpenClaw AI 网关 LuCI 管理插件
-LUCI_DEPENDS:=+luci-compat +luci-base +curl +openssl-util +script-utils +tar +libstdcpp6
+LUCI_DEPENDS:=+luci-compat +luci-base +curl +openssl-util +script-utils +tar +libstdcpp
 LUCI_PKGARCH:=all
 
 # 优先使用 luci.mk (feeds 模式), 不可用时回退 package.mk
diff --git a/scripts/build_ipk.sh b/scripts/build_ipk.sh
index 2fc61d3..eaec21c 100755
--- a/scripts/build_ipk.sh
+++ b/scripts/build_ipk.sh
@@ -106,7 +106,7 @@ mkdir -p "$CTRL_DIR"
 cat > "$CTRL_DIR/control" << EOF
 Package: ${PKG_NAME}
 Version: ${PKG_VERSION}-${PKG_RELEASE}
-Depends: luci-compat, luci-base, curl, openssl-util, script-utils, tar, libstdcpp6
+Depends: luci-compat, luci-base, curl, openssl-util, script-utils, tar, libstdcpp
 Source: https://github.com/10000ge10000/luci-app-openclaw
 SourceName: ${PKG_NAME}
 License: GPL-3.0
diff --git a/scripts/build_run.sh b/scripts/build_run.sh
index c91c169..d80fc34 100755
--- a/scripts/build_run.sh
+++ b/scripts/build_run.sh
@@ -149,7 +149,7 @@ mkdir -p "$INFO_DIR"
 cat > "$INFO_DIR/$PKG.control" << CTLEOF
 Package: $PKG
 Version: $PKG_VER
-Depends: luci-compat, luci-base, curl, openssl-util, script-utils, tar, libstdcpp6
+Depends: luci-compat, luci-base, curl, openssl-util, script-utils, tar, libstdcpp
 Section: luci
 Architecture: all
 Installed-Size: 0
@@ -185,7 +185,7 @@ cat >> "$STATUS_FILE" << STEOF
 
 Package: $PKG
 Version: $PKG_VER
-Depends: luci-compat, luci-base, curl, openssl-util, script-utils, tar, libstdcpp6
+Depends: luci-compat, luci-base, curl, openssl-util, script-utils, tar, libstdcpp
 Status: install user installed
 Architecture: all
 Conffiles:
diff --git a/tests/test_node_packaging_contract.sh b/tests/test_node_packaging_contract.sh
index b4e7761..13cef8a 100644
--- a/tests/test_node_packaging_contract.sh
+++ b/tests/test_node_packaging_contract.sh
@@ -33,6 +33,10 @@ fi
 grep -Fq 'openclaw-paths.sh' "$MAKEFILE" || fail "package makefile should install path helper"
 grep -Fq 'openclaw-node.sh' "$MAKEFILE" || fail "package makefile should install node helper"
 grep -Fq 'openclaw/paths.lua' "$MAKEFILE" || fail "package makefile should install Lua path helper"
+grep -Fq '+libstdcpp' "$MAKEFILE" || fail "package makefile should depend on libstdcpp"
+if grep -Fq 'libstdcpp6' "$MAKEFILE" "$BUILD_IPK" "$BUILD_RUN"; then
+	fail "packaging metadata should not reference libstdcpp6"
+fi
 grep -Fq 'openclaw-paths.sh' "$BUILD_IPK" || fail "ipk builder should package path helper"
 grep -Fq 'openclaw-node.sh' "$BUILD_IPK" || fail "ipk builder should package node helper"
 grep -Fq 'openclaw/paths.lua' "$BUILD_IPK" || fail "ipk builder should package Lua path helper"