From 5985e793813860421ea942ddc030ae849a28c966 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 2 May 2019 16:30:20 +0800 Subject: [PATCH] v2ray: fix build for BCM53xx --- package/lean/v2ray/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index c63a858a0..01c578bda 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray PKG_VERSION:=v4.19 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_RELEASE:=2 include $(INCLUDE_DIR)/package.mk @@ -25,6 +25,8 @@ define Package/$(PKG_NAME)/description V2Ray is a cross-platform proxy software endef +V2RAY_BIN:=v2ray + ifeq ($(ARCH),x86_64) PKG_ARCH_V2RAY:=amd64 endif @@ -39,19 +41,14 @@ ifeq ($(ARCH),i386) endif ifeq ($(ARCH),arm) PKG_ARCH_V2RAY:=arm + ifneq ($(BOARD),bcm53xx) + V2RAY_BIN:=v2ray_armv7 + endif endif ifeq ($(ARCH),aarch64) PKG_ARCH_V2RAY:=arm64 endif -ifeq ($(ARCH),arm) - ifneq ($(BOARD),bcm53xx) - V2RAY_BIN:=v2ray_armv7 - endif -else - V2RAY_BIN:=v2ray -endif - define Build/Prepare endef