hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-03 14:34:27 -05:00
Code Issues Projects Releases Wiki Activity

package: fix cmake packages build with ninja

Browse Source 
+= is needed for CMAKE_OPTIONS.

mt76 needs Ninja disabled as the kernel stuff uses normal make.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2021-06-06 14:24:43 -07:00 committed by Felix Fietkau
parent 97258f5363
commit 09de28090c
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/kernel/mt76/Makefile
View File

@ -13,6 +13,7 @@ PKG_SOURCE_VERSION:=22b690334c0f49b11534cc2e331c9d5e17c4a0bc
PKG_MIRROR_HASH:=ff5e563935919d2e40c1e7254ef3bc06f7ecc5e69f8ddd12903e8f5de942d630 PKG_MIRROR_HASH:=ff5e563935919d2e40c1e7254ef3bc06f7ecc5e69f8ddd12903e8f5de942d630
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_USE_NINJA:=0
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS += \ PKG_CONFIG_DEPENDS += \

2
package/libs/libubox/Makefile
View File

@ -67,7 +67,7 @@ define Package/libubox-lua
endef endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
CMAKE_OPTIONS = \ CMAKE_OPTIONS += \
-DLUAPATH=/usr/lib/lua \ -DLUAPATH=/usr/lib/lua \
-DABIVERSION="$(PKG_ABI_VERSION)" -DABIVERSION="$(PKG_ABI_VERSION)"

2
package/network/services/uhttpd/Makefile
View File

@ -85,7 +85,7 @@ endif
TARGET_LDFLAGS += -lcrypt TARGET_LDFLAGS += -lcrypt
CMAKE_OPTIONS = -DTLS_SUPPORT=on CMAKE_OPTIONS += -DTLS_SUPPORT=on
define Package/uhttpd/install define Package/uhttpd/install
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d

2
package/system/ubus/Makefile
View File

@ -53,7 +53,7 @@ endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -flto TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -flto
TARGET_LDFLAGS += -flto TARGET_LDFLAGS += -flto
CMAKE_OPTIONS = \ CMAKE_OPTIONS += \
-DLUAPATH=/usr/lib/lua \ -DLUAPATH=/usr/lib/lua \
-DABIVERSION="$(PKG_ABI_VERSION)" -DABIVERSION="$(PKG_ABI_VERSION)"

2
package/system/uci/Makefile
View File

@ -55,7 +55,7 @@ endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib
CMAKE_OPTIONS = \ CMAKE_OPTIONS += \
-DLUAPATH=/usr/lib/lua \ -DLUAPATH=/usr/lib/lua \
$(if $(DEBUG),-DUCI_DEBUG=ON) $(if $(DEBUG),-DUCI_DEBUG=ON)