fw876 / helloworld

GNU General Public License v3.0
3.64k stars 2.64k forks source link

@zxlhhyccc 佬,再给他改一下makefile 吧 #1227

Closed sbwml closed 1 year ago

sbwml commented 1 year ago

cc @zxlhhyccc,真的绝了,make defconfig 永远不会选中一个命名不一致的包

diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile
index 6ed28b6..39c409f 100644
--- a/luci-app-ssr-plus/Makefile
+++ b/luci-app-ssr-plus/Makefile
@@ -40,7 +40,7 @@ LUCI_DEPENDS:= \
    +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \
    +PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG:chinadns-ng \
    +PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria \
-   +PACKAGE_$(PKG_NAME)_INCLUDE_TUIC-Client:tuic-client \
+   +PACKAGE_$(PKG_NAME)_INCLUDE_Tuic-Client:tuic-client \
    +PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks:ipt2socks \
    +PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
    +PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
@@ -119,7 +119,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
    select PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
    default n

-config PACKAGE_$(PKG_NAME)_INCLUDE_TUIC-Client
+config PACKAGE_$(PKG_NAME)_INCLUDE_Tuic-Client
    bool "Include tuic-client"
    select PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
    select PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks

或者清一色用下划线都好看些

diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile
index 6ed28b6..864744a 100644
--- a/luci-app-ssr-plus/Makefile
+++ b/luci-app-ssr-plus/Makefile
@@ -10,7 +10,7 @@ PKG_CONFIG_DEPENDS:= \
    CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray \
    CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG \
    CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria \
-   CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Tuic-Client \
+   CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Tuic_Client \
    CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks \
    CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \
    CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy \
@@ -40,7 +40,7 @@ LUCI_DEPENDS:= \
    +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \
    +PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG:chinadns-ng \
    +PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria \
-   +PACKAGE_$(PKG_NAME)_INCLUDE_TUIC-Client:tuic-client \
+   +PACKAGE_$(PKG_NAME)_INCLUDE_Tuic_Client:tuic-client \
    +PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks:ipt2socks \
    +PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
    +PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
@@ -119,7 +119,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
    select PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
    default n

-config PACKAGE_$(PKG_NAME)_INCLUDE_TUIC-Client
+config PACKAGE_$(PKG_NAME)_INCLUDE_Tuic_Client
    bool "Include tuic-client"
    select PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
    select PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks
zxlhhyccc commented 1 year ago

啥意思?

sbwml commented 1 year ago

https://github.com/fw876/helloworld/blob/master/luci-app-ssr-plus/Makefile#L13 https://github.com/fw876/helloworld/blob/master/luci-app-ssr-plus/Makefile#L43

Tuic-Client 、TUIC-Client 大小写。。。

目前意味着 CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Tuic-Client=y 是不存在的

zxlhhyccc commented 1 year ago

https://github.com/fw876/helloworld/blob/master/luci-app-ssr-plus/Makefile#L13 https://github.com/fw876/helloworld/blob/master/luci-app-ssr-plus/Makefile#L43

Tuic-Client 、TUIC-Client 大小写。。。

目前意味着 CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Tuic-Client=y 是不存在的

和这个有啥关系

sbwml commented 1 year ago

是我搞错了 不影响的