• R/O
  • HTTP
  • SSH
  • HTTPS

immortalwrt: Commit

Mirror only - Please move to https://github.com/immortalwrt/immortalwrt


Commit MetaInfo

Revision3a899206e9283a6bf35fcb2c96d54d2b556d87b2 (tree)
Zeit2022-05-18 13:09:41
AutorRosen Penev <rosenp@gmai...>
CommiterTianling Shen

Log Message

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>
(cherry picked from commit 09de28090cfb3fb605e6f4b452503a4ec2c6c43f)

Ändern Zusammenfassung

Diff

--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -67,7 +67,7 @@ define Package/libubox-lua
6767 endef
6868
6969 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
70-CMAKE_OPTIONS = \
70+CMAKE_OPTIONS += \
7171 -DLUAPATH=/usr/lib/lua \
7272 -DABIVERSION="$(PKG_ABI_VERSION)"
7373
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -85,7 +85,7 @@ endif
8585
8686 TARGET_LDFLAGS += -lcrypt
8787
88-CMAKE_OPTIONS = -DTLS_SUPPORT=on
88+CMAKE_OPTIONS += -DTLS_SUPPORT=on
8989
9090 define Package/uhttpd/install
9191 $(INSTALL_DIR) $(1)/etc/init.d
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -53,7 +53,7 @@ endef
5353 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -flto
5454 TARGET_LDFLAGS += -flto
5555
56-CMAKE_OPTIONS = \
56+CMAKE_OPTIONS += \
5757 -DLUAPATH=/usr/lib/lua \
5858 -DABIVERSION="$(PKG_ABI_VERSION)"
5959
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -54,7 +54,7 @@ endef
5454 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
5555 TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib
5656
57-CMAKE_OPTIONS = \
57+CMAKE_OPTIONS += \
5858 -DLUAPATH=/usr/lib/lua \
5959 $(if $(DEBUG),-DUCI_DEBUG=ON)
6060
Show on old repository browser