Mirror only - Please move to https://github.com/immortalwrt/immortalwrt
| Revision | 3a899206e9283a6bf35fcb2c96d54d2b556d87b2 (tree) |
|---|---|
| Zeit | 2022-05-18 13:09:41 |
| Autor | Rosen Penev <rosenp@gmai...> |
| Commiter | Tianling Shen |
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)
package/libs/libubox/Makefile (diff) package/network/services/uhttpd/Makefile (diff) package/system/ubus/Makefile (diff) package/system/uci/Makefile (diff)| @@ -67,7 +67,7 @@ define Package/libubox-lua | ||
| 67 | 67 | endef |
| 68 | 68 | |
| 69 | 69 | TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include |
| 70 | -CMAKE_OPTIONS = \ | |
| 70 | +CMAKE_OPTIONS += \ | |
| 71 | 71 | -DLUAPATH=/usr/lib/lua \ |
| 72 | 72 | -DABIVERSION="$(PKG_ABI_VERSION)" |
| 73 | 73 |
| @@ -85,7 +85,7 @@ endif | ||
| 85 | 85 | |
| 86 | 86 | TARGET_LDFLAGS += -lcrypt |
| 87 | 87 | |
| 88 | -CMAKE_OPTIONS = -DTLS_SUPPORT=on | |
| 88 | +CMAKE_OPTIONS += -DTLS_SUPPORT=on | |
| 89 | 89 | |
| 90 | 90 | define Package/uhttpd/install |
| 91 | 91 | $(INSTALL_DIR) $(1)/etc/init.d |
| @@ -53,7 +53,7 @@ endef | ||
| 53 | 53 | TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -flto |
| 54 | 54 | TARGET_LDFLAGS += -flto |
| 55 | 55 | |
| 56 | -CMAKE_OPTIONS = \ | |
| 56 | +CMAKE_OPTIONS += \ | |
| 57 | 57 | -DLUAPATH=/usr/lib/lua \ |
| 58 | 58 | -DABIVERSION="$(PKG_ABI_VERSION)" |
| 59 | 59 |
| @@ -54,7 +54,7 @@ endef | ||
| 54 | 54 | TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include |
| 55 | 55 | TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib |
| 56 | 56 | |
| 57 | -CMAKE_OPTIONS = \ | |
| 57 | +CMAKE_OPTIONS += \ | |
| 58 | 58 | -DLUAPATH=/usr/lib/lua \ |
| 59 | 59 | $(if $(DEBUG),-DUCI_DEBUG=ON) |
| 60 | 60 |
Fork