Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update makefile support armv7 cpu #1263

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion luci-app-ssr-plus/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_TUIC-Client
bool "Include tuic-client"
select PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
select PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks
depends on aarch64||i686||x86_64
depends on aarch64||arm||i686||x86_64
depends on !(TARGET_x86_geode||TARGET_x86_legacy)
default n

Expand Down
4 changes: 2 additions & 2 deletions tuic-client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TUIC_FOOT:=unknown-linux-musl
ifeq ($(ARCH),aarch64)
TUIC_ARCH:=$(TUIC_TYPE)-aarch64-$(TUIC_FOOT)
PKG_HASH:=c29eaaf3bc05115acc7453ac26bacf9aff65211b1e8ca7f771b818248bec8601
else ifeq ($ARCH),arm64)
else ifeq ($ARCH),arm)
ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
ifeq ($(ARM_CPU_FEATURES),)
TUIC_ARCH:=$(TUIC_TYPE)-armv7-$(TUIC_FOOT)eabi
Expand Down Expand Up @@ -49,7 +49,7 @@ define Package/tuic-client
SUBMENU:=Web Servers/Proxies
TITLE:=Delicately-TUICed 0-RTT proxy protocol
URL:=https://github.com/EAimTY/tuic/
DEPENDS:=@USE_MUSL @(aarch64||arm64||i686||x86_64) @!(TARGET_x86_geode||TARGET_x86_legacy)
DEPENDS:=@USE_MUSL @(aarch64||arm||i686||x86_64) @!(TARGET_x86_geode||TARGET_x86_legacy)
#PKGARCH:=all aarch64 arm i686 x86_64
endef

Expand Down
Loading