From a80b18a363bcd794c22e383e0aa2a21119a3c7fb Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Jun 2021 14:24:43 -0700 Subject: [PATCH] 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 --- package/kernel/mt76/Makefile | 1 + package/libs/libubox/Makefile | 2 +- package/network/services/uhttpd/Makefile | 2 +- package/system/ubus/Makefile | 2 +- package/system/uci/Makefile | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 2e6b84d6e2..f228f2c199 100644 --- 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 +PKG_USE_NINJA:=0 PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS += \ diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 025f6489e7..0f89e70d6d 100644 --- 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 diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 796eb61298..f41cbe9436 100644 --- 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 diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index 824e71924f..ce035e9696 100644 --- 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 diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index 73f2e3fa45..f3764fea93 100644 --- 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)