From 3c28253f3afb9802ad5a4cf17d7208fb432a0f79 Mon Sep 17 00:00:00 2001 From: MoetaYuko Date: Wed, 24 May 2023 11:23:12 +0800 Subject: [PATCH] Define PKG_BUILD_FLAGS:=no-mips16 for necessary packages (#2584) PKG_USE_MIPS16 is deprecated in OpenWrt master branch. We keep both for backward compatibility. --- brook/Makefile | 1 + dns2tcp/Makefile | 1 + hysteria/Makefile | 1 + ipt2socks/Makefile | 1 + naiveproxy/Makefile | 1 + shadowsocksr-libev/Makefile | 1 + simple-obfs/Makefile | 2 ++ trojan-go/Makefile | 1 + v2ray-core/Makefile | 1 + v2ray-plugin/Makefile | 1 + xray-core/Makefile | 1 + xray-plugin/Makefile | 1 + 12 files changed, 13 insertions(+) diff --git a/brook/Makefile b/brook/Makefile index cfc0b0f9e..2949f505d 100644 --- a/brook/Makefile +++ b/brook/Makefile @@ -19,6 +19,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/txthinking/brook GO_PKG_BUILD_PKG:=$(GO_PKG)/cli/brook diff --git a/dns2tcp/Makefile b/dns2tcp/Makefile index c2e11bc91..93184caac 100644 --- a/dns2tcp/Makefile +++ b/dns2tcp/Makefile @@ -20,6 +20,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 include $(INCLUDE_DIR)/package.mk diff --git a/hysteria/Makefile b/hysteria/Makefile index 3a7e4b122..9cc96b291 100644 --- a/hysteria/Makefile +++ b/hysteria/Makefile @@ -19,6 +19,7 @@ PKG_MAINTAINER:=Tianling Shen PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/apernet/hysteria GO_PKG_BUILD_PKG:=$(GO_PKG)/app/cmd diff --git a/ipt2socks/Makefile b/ipt2socks/Makefile index c90013233..a7bddda1f 100644 --- a/ipt2socks/Makefile +++ b/ipt2socks/Makefile @@ -14,6 +14,7 @@ PKG_HASH:=5279eb1cb7555cf9292423cc9f672dc43e6e214b3411a6df26a6a1cfa59d88b7 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 PKG_LICENSE:=AGPL-3.0 PKG_LICENSE_FILE:=LICENSE diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile index 4b167d5a1..b45ce0c8f 100644 --- a/naiveproxy/Makefile +++ b/naiveproxy/Makefile @@ -22,6 +22,7 @@ PKG_BUILD_DEPENDS+= ninja/host endif PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 ifneq ($(CONFIG_CPU_TYPE)," ") CPU_TYPE:=$(word 1, $(subst +," ,$(CONFIG_CPU_TYPE))) diff --git a/shadowsocksr-libev/Makefile b/shadowsocksr-libev/Makefile index 53612b233..304c4f18a 100644 --- a/shadowsocksr-libev/Makefile +++ b/shadowsocksr-libev/Makefile @@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_FIXUP:=autoreconf PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/simple-obfs/Makefile b/simple-obfs/Makefile index aa7be91a4..9cc88f1cc 100644 --- a/simple-obfs/Makefile +++ b/simple-obfs/Makefile @@ -23,6 +23,8 @@ PKG_BUILD_DEPENDS:=libev PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 include $(INCLUDE_DIR)/package.mk diff --git a/trojan-go/Makefile b/trojan-go/Makefile index 6f00b833c..d5ea62fba 100644 --- a/trojan-go/Makefile +++ b/trojan-go/Makefile @@ -19,6 +19,7 @@ PKG_MAINTAINER:=Tianling Shen PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/p4gefau1t/trojan-go GO_PKG_BUILD_PKG:=$(GO_PKG) diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile index ae621f975..d80ca8cfc 100644 --- a/v2ray-core/Makefile +++ b/v2ray-core/Makefile @@ -19,6 +19,7 @@ PKG_MAINTAINER:=Tianling Shen PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/v2fly/v2ray-core/v5 GO_PKG_BUILD_PKG:=$(GO_PKG)/main diff --git a/v2ray-plugin/Makefile b/v2ray-plugin/Makefile index 3dcad0b89..3b6b05a2e 100644 --- a/v2ray-plugin/Makefile +++ b/v2ray-plugin/Makefile @@ -20,6 +20,7 @@ PKG_MAINTAINER:=madeye PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/shadowsocks/v2ray-plugin GO_PKG_LDFLAGS_X:=main.VERSION=v$(PKG_VERSION) diff --git a/xray-core/Makefile b/xray-core/Makefile index dd61386a2..94ccfc7ff 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -16,6 +16,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/Xray-core-$(PKG_VERSION) PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/xtls/xray-core GO_PKG_LDFLAGS:=-s -w diff --git a/xray-plugin/Makefile b/xray-plugin/Makefile index 8ba8dd139..cc84121dc 100644 --- a/xray-plugin/Makefile +++ b/xray-plugin/Makefile @@ -19,6 +19,7 @@ PKG_MAINTAINER:=Tianling Shen PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/teddysun/xray-plugin