Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-09 02:43:53 +08:00
Code Issues Actions Packages 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>
(cherry picked from commit 09de28090cfb3fb605e6f4b452503a4ec2c6c43f)
This commit is contained in:
Rosen Penev 2021-06-06 14:24:43 -07:00 committed by Tianling Shen
parent f1ede25688
commit 3a899206e9
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,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)