treewide: build CMake projects with Ninja

faster to compile.

A small selection of packages was tested going from:

Executed in  696.30 secs   fish           external
   usr time   82.98 mins  395.00 micros   82.98 mins
   sys time    9.02 mins    0.00 micros    9.02 mins

to:

Executed in  592.20 secs   fish           external
   usr time   84.84 mins  361.00 micros   84.84 mins
   sys time    8.85 mins   57.00 micros    8.85 mins

Tested by running make -j 12 and wiping staging/build_dir/target_x

Signed-off-by: Rosen Penev <rosenp@gmail.com>

14 files changed, 16 insertions, 25 deletions

diff --git a/net/apfree-wifidog/Makefile b/net/apfree-wifidog/Makefile
index 31334fb8e..4fa2ebb1a 100644
--- a/net/apfree-wifidog/Makefile
+++ b/net/apfree-wifidog/Makefile
@@ -21,7 +21,7 @@ PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/apfree-wifidog
   SUBMENU:=Captive Portals
diff --git a/net/cgi-io/Makefile b/net/cgi-io/Makefile
index 9384a1b72..3b6ca337f 100644
--- a/net/cgi-io/Makefile
+++ b/net/cgi-io/Makefile
@@ -21,7 +21,7 @@ PKG_LICENSE:=GPL-2.0-or-later
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/cgi-io
   SECTION:=net
diff --git a/net/clamav/Makefile b/net/clamav/Makefile
index 3adb15316..abb59769a 100644
--- a/net/clamav/Makefile
+++ b/net/clamav/Makefile
@@ -22,11 +22,10 @@ PKG_LICENSE_FILES:=COPYING*
 PKG_CPE_ID:=cpe:/a:clamav:clamav
 
 PKG_BUILD_DEPENDS:=ncurses
-PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
 include $(INCLUDE_DIR)/nls.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/clamav/Default
   SECTION:=net
diff --git a/net/dawn/Makefile b/net/dawn/Makefile
index 25ebd0745..2178cd8b1 100644
--- a/net/dawn/Makefile
+++ b/net/dawn/Makefile
@@ -17,10 +17,8 @@ PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/dawn
   SECTION:=net
diff --git a/net/etherwake-nfqueue/Makefile b/net/etherwake-nfqueue/Makefile
index 19897f7a6..a62705d4d 100644
--- a/net/etherwake-nfqueue/Makefile
+++ b/net/etherwake-nfqueue/Makefile
@@ -20,7 +20,7 @@ PKG_MAINTAINER:=Mister Benjamin <144dbspl@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/etherwake-nfqueue
   SECTION:=net
diff --git a/net/lora-gateway-hal/Makefile b/net/lora-gateway-hal/Makefile
index 80e802b17..9a8b4f941 100644
--- a/net/lora-gateway-hal/Makefile
+++ b/net/lora-gateway-hal/Makefile
@@ -19,7 +19,7 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_BUILD_DIR:=$(BUILD_DIR)/lora_gateway-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libloragw
   SECTION:=libs
diff --git a/net/nginx-util/Makefile b/net/nginx-util/Makefile
index 54eb8bf87..980b5ddce 100644
--- a/net/nginx-util/Makefile
+++ b/net/nginx-util/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
 PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at>
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 CMAKE_OPTIONS+= -DUBUS=y
 CMAKE_OPTIONS+= -DVERSION=$(PKG_VERSION)
diff --git a/net/nlbwmon/Makefile b/net/nlbwmon/Makefile
index 9e3a8ba75..d3a27573e 100644
--- a/net/nlbwmon/Makefile
+++ b/net/nlbwmon/Makefile
@@ -16,7 +16,7 @@ PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=COPYING
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 CMAKE_OPTIONS += -DLIBNL_LIBRARY_TINY=ON
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny
diff --git a/net/phantap/Makefile b/net/phantap/Makefile
index 298625f64..4c9cd6184 100644
--- a/net/phantap/Makefile
+++ b/net/phantap/Makefile
@@ -20,7 +20,7 @@ PKG_MAINTAINER:=Diana Dragusin <diana.dragusin@nccgroup.com>, \
 PKG_LICENSE:=GPL-3.0-only
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 CMAKE_SOURCE_SUBDIR:=src
 
diff --git a/net/snort3/Makefile b/net/snort3/Makefile
index 4530596a8..24e1ead50 100644
--- a/net/snort3/Makefile
+++ b/net/snort3/Makefile
@@ -19,10 +19,8 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:snort:snort
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/snort3
   SUBMENU:=Firewall
diff --git a/net/softethervpn5/Makefile b/net/softethervpn5/Makefile
index 1c08ab6bd..f9dca5739 100644
--- a/net/softethervpn5/Makefile
+++ b/net/softethervpn5/Makefile
@@ -23,7 +23,7 @@ PKG_BUILD_DEPENDS:=softethervpn5/host
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/softethervpn5/Default
   SECTION:=net
@@ -84,7 +84,7 @@ export USE_MUSL=YES
 # BUG: outdated host/include/elf.h
 HOST_CFLAGS += $(FPIC) -DAT_HWCAP2=26
 TARGET_CFLAGS += $(FPIC)
-CMAKE_OPTIONS = -DICONV_LIB_PATH="$(ICONV_PREFIX)/lib"
+CMAKE_OPTIONS += -DICONV_LIB_PATH="$(ICONV_PREFIX)/lib"
 
 # static build for host (hamcorebuilder), avoid -fpic on ncurses/host and shared libs can't be found on host
 define Host/Prepare
diff --git a/net/spawn-fcgi/Makefile b/net/spawn-fcgi/Makefile
index 37641046b..04032a467 100644
--- a/net/spawn-fcgi/Makefile
+++ b/net/spawn-fcgi/Makefile
@@ -19,10 +19,8 @@ PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/spawn-fcgi
   SUBMENU:=Web Servers/Proxies
diff --git a/net/stubby/Makefile b/net/stubby/Makefile
index 739e33e39..0fa02d87a 100644
--- a/net/stubby/Makefile
+++ b/net/stubby/Makefile
@@ -18,10 +18,9 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/stubby/Default
   TITLE:=stubby
diff --git a/net/vallumd/Makefile b/net/vallumd/Makefile
index dd4811b26..7277bf721 100644
--- a/net/vallumd/Makefile
+++ b/net/vallumd/Makefile
@@ -15,13 +15,12 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/stintel/vallumd/tar.gz/vallumd-$(PKG_VERSION)?
 PKG_HASH:=d6119f84840ff36f05c273f0a6f3e0f9eacf3a07c1583271c4fef62a7b199428
 
+PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
 
-PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/vallumd
   SECTION:=net