package: fix cmake packages build with ninja

+= is needed for CMAKE_OPTIONS. mt76 needs Ninja disabled as the kernel stuff uses normal make. Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-06-06 14:24:43 -07:00 · 2021-06-06 14:24:43 -07:00 · a80b18a363
commit a80b18a363
parent 056b026135
5 changed files with 5 additions and 4 deletions
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@ -13,6 +13,7 @@ PKG_SOURCE_VERSION:=5c768dec13389700ff3fa3d25083fb43d8e7adda
 PKG_MIRROR_HASH:=2ef0cf233bedc20e77c61cd6dd6085e162cce5c2719b5285bcdd8bf92ebf88eb

 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+PKG_USE_NINJA:=0
 PKG_BUILD_PARALLEL:=1

 PKG_CONFIG_DEPENDS += \
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@ -64,7 +64,7 @@ define Package/libubox-lua
 endef

 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-CMAKE_OPTIONS = \
+CMAKE_OPTIONS += \
 	-DLUAPATH=/usr/lib/lua

 define Package/libubox/install
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@ -85,7 +85,7 @@ endif

 TARGET_LDFLAGS += -lcrypt

-CMAKE_OPTIONS = -DTLS_SUPPORT=on
+CMAKE_OPTIONS += -DTLS_SUPPORT=on

 define Package/uhttpd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@ -51,7 +51,7 @@ endef
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -flto
 TARGET_LDFLAGS += -flto

-CMAKE_OPTIONS = \
+CMAKE_OPTIONS += \
 	-DLUAPATH=/usr/lib/lua

 define Package/ubus/install
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@ -55,7 +55,7 @@ endef
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib

-CMAKE_OPTIONS = \
+CMAKE_OPTIONS += \
 	-DLUAPATH=/usr/lib/lua \
 	$(if $(DEBUG),-DUCI_DEBUG=ON)