2
0
Эх сурвалжийг харах

Merge pull request #594 from 1715173329/naive

naiveproxy: compat with stable version
coolsnowwolf 4 жил өмнө
parent
commit
f307754769
1 өөрчлөгдсөн 12 нэмэгдсэн , 1 устгасан
  1. 12 1
      naiveproxy/Makefile

+ 12 - 1
naiveproxy/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
 PKG_VERSION:=91.0.4472.77-1
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?
@@ -17,6 +17,9 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Tianling Shen <[email protected]>
 
 PKG_BUILD_DEPENDS:=python3/host
+ifneq ($(wildcard $(TOPDIR)/feeds/packages/devel/ninja/ninja.mk),)
+PKG_BUILD_DEPENDS+= ninja/host
+endif
 PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1
 
@@ -101,6 +104,14 @@ define Build/Prepare
 	)
 endef
 
+ifeq ($(NINJA),)
+NINJA = \
+	MAKEFLAGS="$(MAKE_JOBSERVER)" \
+		$(STAGING_DIR_HOSTPKG)/bin/ninja \
+		$(if $(findstring c,$(OPENWRT_VERBOSE)),-v) \
+		$(if $(MAKE_JOBSERVER),,-j1)
+endif
+
 define Build/Compile
 	( \
 		cd "$(PKG_BUILD_DIR)/src" ; \