Browse Source

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>
Rosen Penev 4 months ago
parent
commit
a31b732007
85 changed files with 118 additions and 187 deletions
  1. 1 1
      lang/lua-cjson/Makefile
  2. 1 1
      lang/lzmq/Makefile
  3. 1 1
      libs/afalg_engine/Makefile
  4. 1 2
      libs/c-ares/Makefile
  5. 1 2
      libs/cereal/Makefile
  6. 1 3
      libs/cjson/Makefile
  7. 1 2
      libs/czmq/Makefile
  8. 2 2
      libs/elektra/Makefile
  9. 1 2
      libs/expat/Makefile
  10. 1 2
      libs/getdns/Makefile
  11. 2 3
      libs/h2o/Makefile
  12. 1 3
      libs/libarchive/Makefile
  13. 1 1
      libs/libcbor/Makefile
  14. 1 1
      libs/libevhtp/Makefile
  15. 10 1
      libs/libfido2/Makefile
  16. 1 1
      libs/libfmt/Makefile
  17. 1 2
      libs/libftdi/Makefile
  18. 1 2
      libs/libftdi1/Makefile
  19. 1 4
      libs/libiio/Makefile
  20. 1 2
      libs/libjpeg-turbo/Makefile
  21. 1 2
      libs/liblo/Makefile
  22. 3 2
      libs/libmraa/Makefile
  23. 1 2
      libs/libnatpmp/Makefile
  24. 1 1
      libs/libnatpmp/patches/010-cmake.patch
  25. 1 1
      libs/libpqxx/Makefile
  26. 1 3
      libs/libradiotap/Makefile
  27. 1 2
      libs/libroxml/Makefile
  28. 1 3
      libs/libsndfile/Makefile
  29. 6 5
      libs/libsoxr/Makefile
  30. 2 3
      libs/libssh/Makefile
  31. 1 2
      libs/libssh2/Makefile
  32. 1 2
      libs/libtins/Makefile
  33. 1 1
      libs/libuecc/Makefile
  34. 1 2
      libs/libuhttpd/Makefile
  35. 3 3
      libs/libupm/Makefile
  36. 1 3
      libs/libvorbis/Makefile
  37. 1 2
      libs/libwebp/Makefile
  38. 1 1
      libs/libwebsockets/Makefile
  39. 1 2
      libs/libwslay/Makefile
  40. 1 3
      libs/libxerces-c/Makefile
  41. 1 2
      libs/libyaml-cpp/Makefile
  42. 1 2
      libs/libzip/Makefile
  43. 1 2
      libs/lzo/Makefile
  44. 1 3
      libs/nghttp2/Makefile
  45. 1 2
      libs/pcre2/Makefile
  46. 1 2
      libs/protobuf-c/Makefile
  47. 2 3
      libs/qrencode/Makefile
  48. 1 3
      libs/tiff/Makefile
  49. 1 3
      libs/uci2/Makefile
  50. 1 1
      libs/websocketpp/Makefile
  51. 1 2
      libs/yajl/Makefile
  52. 1 2
      libs/zmq/Makefile
  53. 1 1
      net/apfree-wifidog/Makefile
  54. 1 1
      net/cgi-io/Makefile
  55. 1 2
      net/clamav/Makefile
  56. 1 3
      net/dawn/Makefile
  57. 1 1
      net/etherwake-nfqueue/Makefile
  58. 1 1
      net/lora-gateway-hal/Makefile
  59. 1 1
      net/nginx-util/Makefile
  60. 1 1
      net/nlbwmon/Makefile
  61. 1 1
      net/phantap/Makefile
  62. 1 3
      net/snort3/Makefile
  63. 2 2
      net/softethervpn5/Makefile
  64. 1 3
      net/spawn-fcgi/Makefile
  65. 1 2
      net/stubby/Makefile
  66. 2 3
      net/vallumd/Makefile
  67. 1 2
      sound/portaudio/Makefile
  68. 1 1
      utils/auc/Makefile
  69. 1 3
      utils/canutils/Makefile
  70. 2 5
      utils/domoticz/Makefile
  71. 1 2
      utils/ecdsautils/Makefile
  72. 1 2
      utils/gammu/Makefile
  73. 1 3
      utils/mariadb/Makefile
  74. 1 1
      utils/netwhere/Makefile
  75. 5 4
      utils/openobex/Makefile
  76. 1 1
      utils/rpcd-mod-lxc/Makefile
  77. 1 2
      utils/rtl-sdr/Makefile
  78. 1 3
      utils/rtl_433/Makefile
  79. 2 4
      utils/rtty/Makefile
  80. 1 2
      utils/sumo/Makefile
  81. 1 4
      utils/taskwarrior/Makefile
  82. 2 3
      utils/telldus-core/Makefile
  83. 3 5
      utils/tini/Makefile
  84. 1 3
      utils/ttyd/Makefile
  85. 1 2
      utils/uvcdynctrl/Makefile

+ 1 - 1
lang/lua-cjson/Makefile

@@ -22,7 +22,7 @@ HOST_BUILD_DEPENDS:=lua/host
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/lua-cjson
   SUBMENU:=Lua

+ 1 - 1
lang/lzmq/Makefile

@@ -18,7 +18,7 @@ PKG_SOURCE_URL:=https://codeload.github.com/zeromq/lzmq/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=cf70200045b8bcb0e929c338ad421b6a291cf1038053532888dc201af3224d8b
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/lzmq
   SUBMENU:=Lua

+ 1 - 1
libs/afalg_engine/Makefile

@@ -24,7 +24,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_AFALG_ZERO_COPY
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 ENGINES_DIR:=engines-1.1
 

+ 1 - 2
libs/c-ares/Makefile

@@ -21,10 +21,9 @@ PKG_LICENSE_FILES:=LICENSE.md
 PKG_CPE_ID:=cpe:/a:c-ares_project:c-ares
 
 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/libcares
   SECTION:=libs

+ 1 - 2
libs/cereal/Makefile

@@ -19,10 +19,9 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 CMAKE_OPTIONS += \
 	-DCMAKE_CXX_FLAGS=-latomic \

+ 1 - 3
libs/cjson/Makefile

@@ -15,10 +15,8 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:cjson_project:cjson
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/cJSON
   SECTION:=libs

+ 1 - 2
libs/czmq/Makefile

@@ -20,10 +20,9 @@ PKG_LICENSE:=MPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 
 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/czmq
   SECTION:=libs

+ 2 - 2
libs/elektra/Makefile

@@ -32,7 +32,7 @@ PKG_SOURCE_URL:=http://ftp.libelektra.org/ftp/elektra/releases
 PKG_BUILD_DEPENDS:= lua
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 include $(INCLUDE_DIR)/nls.mk
 
 define Package/libelektra/Default
@@ -286,7 +286,7 @@ endef
 
 CMAKE_BINARY_SUBDIR=build
 
-CMAKE_OPTIONS = \
+CMAKE_OPTIONS += \
 	-DTARGET_PLUGIN_FOLDER="" \
 	-DCARGO_EXECUTABLE=OFF \
 	-DBUILD_FULL=OFF \

+ 1 - 2
libs/expat/Makefile

@@ -19,11 +19,10 @@ PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:libexpat:expat
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libexpat
   SECTION:=libs

+ 1 - 2
libs/getdns/Makefile

@@ -17,14 +17,13 @@ PKG_SOURCE_URL:=https://getdnsapi.net/dist/
 PKG_HASH:=40e5737471a3902ba8304b0fd63aa7c95802f66ebbc6eae53c487c8e8a380f4a
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_GETDNS_ENABLE_STUB_ONLY \
 	CONFIG_GETDNS_ENABLE_IDN_LIBIDN2
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/getdns/Default
 	TITLE:=getdns

+ 2 - 3
libs/h2o/Makefile

@@ -13,12 +13,11 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 PKG_BUILD_DEPENDS:=ruby/host libwslay
-PKG_BUILD_PARALLEL:=1
 
-CMAKE_OPTIONS:= \
+CMAKE_OPTIONS += \
 	-DBUILD_SHARED_LIBS=ON \
 	-DWITH_MRUBY=OFF
 

+ 1 - 3
libs/libarchive/Makefile

@@ -20,10 +20,8 @@ PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:libarchive:libarchive
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libarchive/Default
   SECTION:=libs

+ 1 - 1
libs/libcbor/Makefile

@@ -24,7 +24,7 @@ CMAKE_OPTIONS += \
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libcbor
   SECTION:=libs

+ 1 - 1
libs/libevhtp/Makefile

@@ -31,7 +31,7 @@ CMAKE_INSTALL:=1
 PKG_CONFIG_DEPENDS:=LIBEVHTP_BUILD_DEPENDS
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libevhtp
     SECTION:=libs

+ 10 - 1
libs/libfido2/Makefile

@@ -25,7 +25,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/libfido2
   SECTION:=libs
@@ -42,6 +42,15 @@ define Package/libfido2/description
  libfido2 supports the FIDO U2F (CTAP 1) and FIDO 2.0 (CTAP 2) protocols.
 endef
 
+CMAKE_OPTIONS += \
+	-DBUILD_EXAMPLES=OFF \
+	-DBUILD_MANPAGES=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_STATIC_LIBS=OFF \
+	-DBUILD_TOOLS=OFF \
+	-DFUZZ=OFF \
+	-DLIBFUZZER=OFF \
+	-DUSE_HIDAPI=OFF
 
 define Package/libfido2/install
 	$(INSTALL_DIR) $(1)/usr/lib

+ 1 - 1
libs/libfmt/Makefile

@@ -24,7 +24,7 @@ PKG_LICENSE_FILES:=LICENSE.rst
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 CMAKE_OPTIONS += -DBUILD_SHARED_LIBS=ON
 CMAKE_OPTIONS += -DFMT_DOC=OFF

+ 1 - 2
libs/libftdi/Makefile

@@ -20,11 +20,10 @@ PKG_LICENSE:=LGPL-2.0
 PKG_LICENSE_FILES:=COPYING.LIB
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libftdi
   SECTION:=libs

+ 1 - 2
libs/libftdi1/Makefile

@@ -20,11 +20,10 @@ PKG_LICENSE:=LGPL-2.1-only
 PKG_LICENSE_FILES:=COPYING.LIB
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libftdi1
   SECTION:=libs

+ 1 - 4
libs/libiio/Makefile

@@ -20,9 +20,6 @@ PKG_LICENSE_FILES:=COPYING.txt
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
 CMAKE_INSTALL:=1
 
 PKG_CONFIG_DEPENDS:= \
@@ -33,8 +30,8 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_LIBIIO_XML_BACKEND
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
 include $(INCLUDE_DIR)/nls.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 CMAKE_OPTIONS += -DWITH_DOC=OFF
 CMAKE_OPTIONS += -DENABLE_IPV6=$(if $(CONFIG_IPV6),ON,OFF)

+ 1 - 2
libs/libjpeg-turbo/Makefile

@@ -13,10 +13,9 @@ PKG_LICENSE:=BSD-3-Clause IJG zlib
 PKG_LICENSE_FILES:=LICENSE.md
 
 PKG_USE_MIPS16:=0 #Allows ASM compilation for speed.
-PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libjpeg-turbo/Default
   TITLE:=libjpeg-turbo

+ 1 - 2
libs/liblo/Makefile

@@ -21,11 +21,10 @@ PKG_LICENSE_FILES:=COPYING
 
 CMAKE_INSTALL:=1
 CMAKE_SOURCE_SUBDIR:=cmake
-PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_liblo-utils
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/liblo/Default
   TITLE:=Lightweight Open Sound Control (OSC)

+ 3 - 2
libs/libmraa/Makefile

@@ -26,10 +26,11 @@ PKG_USE_MIPS16:=0
 PYTHON3_PKG_BUILD:=0
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 include ../../lang/python/python3-package.mk
 
-CMAKE_OPTIONS=-DENABLEEXAMPLES=0 \
+CMAKE_OPTIONS += \
+	-DENABLEEXAMPLES=0 \
 	-DBUILDSWIGNODE=$(if $(CONFIG_PACKAGE_libmraa-node),ON,OFF) \
 	-DFIRMATA=ON
 

+ 1 - 2
libs/libnatpmp/Makefile

@@ -19,11 +19,10 @@ PKG_MAINTAINER:=
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libnatpmp/Default
   TITLE:=NAT Port Mapping Protocol (NAT-PMP)

+ 1 - 1
libs/libnatpmp/patches/010-cmake.patch

@@ -43,7 +43,7 @@
 +add_executable(natpmpc natpmpc.c)
 +target_link_libraries(natpmpc natpmp)
 +
-+install(FILES natpmpc DESTINATION bin)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/natpmpc DESTINATION bin)
 +
 +add_executable(testgetgateway
 +	testgetgateway.c

+ 1 - 1
libs/libpqxx/Makefile

@@ -14,7 +14,7 @@ CMAKE_INSTALL:=1
 PKG_MAINTAINER:=Igor Bezzubchenko <garikello@gmail.com>
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libpqxx
 	SECTION:=libs

+ 1 - 3
libs/libradiotap/Makefile

@@ -18,10 +18,8 @@ PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
 PKG_LICENSE:=ISC
 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/libradiotap
 	SECTION:=libs

+ 1 - 2
libs/libroxml/Makefile

@@ -20,10 +20,9 @@ PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=License.txt
 
 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/libroxml
   SECTION:=libs

+ 1 - 3
libs/libsndfile/Makefile

@@ -20,10 +20,8 @@ PKG_LICENSE:=LGPLv2.1
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:libsndfile_project:libsndfile
 
-PKG_INSTALL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libsndfile
   SECTION:=libs

+ 6 - 5
libs/libsoxr/Makefile

@@ -22,10 +22,9 @@ PKG_LICENSE_FILES:=LICENCE
 PKG_CPE_ID:=cpe:/a:sox:sox
 
 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/libsoxr
   SECTION:=libs
@@ -40,9 +39,11 @@ define Package/libsoxr/description
   High quality, one-dimensional sample-rate conversion library
 endef
 
-CMAKE_OPTIONS:= -DBUILD_TESTS=0 -DBUILD_EXAMPLES=0
-CMAKE_OPTIONS+= -DHAVE_WORDS_BIGENDIAN_EXITCODE=$(if $(CONFIG_BIG_ENDIAN),0,1)
-CMAKE_OPTIONS+= -DWITH_OPENMP=0
+CMAKE_OPTIONS += \
+	-DBUILD_TESTS=0 \
+	-DBUILD_EXAMPLES=0 \
+	-DWITH_OPENMP=0 \
+	-DHAVE_WORDS_BIGENDIAN_EXITCODE=$(if $(CONFIG_BIG_ENDIAN),0,1)
 
 define Package/libsoxr/install
 	$(INSTALL_DIR) $(1)/usr/lib

+ 2 - 3
libs/libssh/Makefile

@@ -22,11 +22,10 @@ PKG_CPE_ID:=cpe:/a:libssh:libssh
 
 CMAKE_INSTALL:=1
 CMAKE_BINARY_SUBDIR:=build
-PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libssh
   SECTION:=libs
@@ -41,7 +40,7 @@ define Package/libssh/description
  for client and server implementations.
 endef
 
-CMAKE_OPTIONS = \
+CMAKE_OPTIONS += \
 	-DHAVE_STRTOULL=1 \
 	-DHAVE_GETADDRINFO=1 \
 	-DHAVE_TERMIOS_H=1 \

+ 1 - 2
libs/libssh2/Makefile

@@ -21,14 +21,13 @@ PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:libssh2:libssh2
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_LIBSSH2_MBEDTLS \
 	CONFIG_LIBSSH2_OPENSSL
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libssh2
   SECTION:=libs

+ 1 - 2
libs/libtins/Makefile

@@ -19,11 +19,10 @@ PKG_MAINTAINER:= Steven Hessing <steven.hessing@gmail.com>
 PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libtins
   SECTION:=net

+ 1 - 1
libs/libuecc/Makefile

@@ -20,7 +20,7 @@ PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=COPYRIGHT
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libuecc
   SECTION:=libs

+ 1 - 2
libs/libuhttpd/Makefile

@@ -19,11 +19,10 @@ PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libuhttpd/Default
   SECTION:=libs

+ 3 - 3
libs/libupm/Makefile

@@ -23,11 +23,10 @@ PKG_LICENSE_FILES:=LICENSE
 CMAKE_INSTALL:=1
 CMAKE_BINARY_SUBDIR:=build
 PKG_USE_MIPS16:=0
-PKG_BUILD_PARALLEL:=1
 PYTHON3_PKG_BUILD:=0
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 include ../../lang/python/python3-package.mk
 
 UPM_MODULES:= \
@@ -53,7 +52,8 @@ UPM_MODULES:= \
 # (require libbacnet) tb7300 t8100 e50hx bacnetmstp
 # (require libtinyb) 2jciebu01_ble 2jciebu01_usb
 
-CMAKE_OPTIONS=-DBUILDSWIGNODE=$(if $(CONFIG_PACKAGE_libmraa-node),ON,OFF) \
+CMAKE_OPTIONS += \
+	-DBUILDSWIGNODE=$(if $(CONFIG_PACKAGE_libmraa-node),ON,OFF) \
 	-DPYTHON2LIBS_FOUND=FALSE \
 	-DPYTHON2INTERP_FOUND=FALSE \
 

+ 1 - 3
libs/libvorbis/Makefile

@@ -18,10 +18,8 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:xiph.org:libvorbis
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libvorbis
   SECTION:=libs

+ 1 - 2
libs/libwebp/Makefile

@@ -13,10 +13,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/libwebp
   SECTION:=libs

+ 1 - 1
libs/libwebsockets/Makefile

@@ -24,7 +24,7 @@ PKG_LICENSE_FILES:=LICENSE
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 CMAKE_OPTIONS += -DLWS_IPV6=$(if $(CONFIG_IPV6),ON,OFF)
 CMAKE_OPTIONS += -DISABLE_WERROR=ON

+ 1 - 2
libs/libwslay/Makefile

@@ -14,10 +14,9 @@ PKG_LICENSE:=MIT
 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/libwslay
   SECTION:=libs

+ 1 - 3
libs/libxerces-c/Makefile

@@ -19,11 +19,9 @@ PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libxerces-c/Default
   SECTION:=libs

+ 1 - 2
libs/libyaml-cpp/Makefile

@@ -22,10 +22,9 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:yaml-cpp_project:yaml-cpp
 
 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/libyaml-cpp
   SECTION:=development

+ 1 - 2
libs/libzip/Makefile

@@ -18,11 +18,10 @@ PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libzip/Default
   TITLE:=libzip ($(2))

+ 1 - 2
libs/lzo/Makefile

@@ -18,11 +18,10 @@ PKG_HASH:=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_BINARY_SUBDIR:=openwrt-build
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/liblzo
   SECTION:=libs

+ 1 - 3
libs/nghttp2/Makefile

@@ -12,10 +12,8 @@ PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
 PKG_LICENSE:=MIT
 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/libnghttp2
   SECTION:=libs

+ 1 - 2
libs/pcre2/Makefile

@@ -20,14 +20,13 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENCE
 PKG_CPE_ID:=cpe:/a:pcre:pcre
 
-PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS:=\
 	CONFIG_PACKAGE_libpcre2-16 \
 	CONFIG_PACKAGE_libpcre2-32 \
 	CONFIG_PCRE2_JIT_ENABLED
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libpcre2/default
   SECTION:=libs

+ 1 - 2
libs/protobuf-c/Makefile

@@ -25,12 +25,11 @@ HOST_BUILD_DEPENDS:=protobuf/host
 PKG_BUILD_DEPENDS:=protobuf
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 CMAKE_SOURCE_SUBDIR:=build-cmake
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libprotobuf-c
   TITLE:=Protocol Buffers library

+ 2 - 3
libs/qrencode/Makefile

@@ -19,11 +19,10 @@ PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_qrencode
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libqrencode
   SECTION:=libs
@@ -68,7 +67,7 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/qrencode.h $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libqrencode.so* $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/libqrencode.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libqrencode.pc $(1)/usr/lib/pkgconfig/
 	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libqrencode.pc
 	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libqrencode.pc
 endef

+ 1 - 3
libs/tiff/Makefile

@@ -20,10 +20,8 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYRIGHT
 PKG_CPE_ID:=cpe:/a:libtiff:libtiff
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/tiff/Default
   TITLE:=TIFF

+ 1 - 3
libs/uci2/Makefile

@@ -13,10 +13,8 @@ PKG_MAINTAINER:=Jakov Petrina <jakov.petrina@sartura.hr>
 PKG_LICENSE:=BSD-3-Clause
 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/libuci2/Default
 	TITLE:=AST-based C parser library for UCI

+ 1 - 1
libs/websocketpp/Makefile

@@ -17,7 +17,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 CMAKE_INSTALL:=1
 

+ 1 - 2
libs/yajl/Makefile

@@ -20,11 +20,10 @@ PKG_MAINTAINER:=Charles Southerland <charlie@stuphlabs.com>
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/yajl
   SECTION:=libs

+ 1 - 2
libs/zmq/Makefile

@@ -22,11 +22,10 @@ PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENCE.txt
 PKG_CPE_ID:=cpe:/a:zeromq:libzmq
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_BINARY_SUBDIR:=openwrt-build
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libzmq/default
   TITLE:=ZeroMQ - Message Queue engine

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 2
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

+ 1 - 3
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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)

+ 1 - 1
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

+ 1 - 1
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
 

+ 1 - 3
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

+ 2 - 2
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

+ 1 - 3
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

+ 1 - 2
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

+ 2 - 3
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

+ 1 - 2
sound/portaudio/Makefile

@@ -21,10 +21,9 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE.txt
 
 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/portaudio
   SECTION:=sound

+ 1 - 1
utils/auc/Makefile

@@ -10,7 +10,7 @@ PKG_RELEASE:=$(AUTORELEASE)
 PKG_LICENSE:=GPL-3.0
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/auc
   SECTION:=base

+ 1 - 3
utils/canutils/Makefile

@@ -20,10 +20,8 @@ PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
 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/canutils/Default
   SECTION:=utils

+ 2 - 5
utils/domoticz/Makefile

@@ -19,13 +19,10 @@ PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=License.txt
 
 PKG_BUILD_DEPENDS:=python3 minizip cereal
-PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
-CMAKE_INSTALL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/domoticz
   SECTION:=utils
@@ -42,7 +39,7 @@ define Package/domoticz
 	+jsoncpp \
 	+libcurl \
 	+python3 \
-	+minizip \
+	+minizip @BROKEN \
 	+lua5.3 \
 	+libmosquitto \
 	+libopenssl \

+ 1 - 2
utils/ecdsautils/Makefile

@@ -19,11 +19,10 @@ PKG_MIRROR_HASH:=397395a471c0b5af1a173666ba21a5bedb4c3423a6e37c545c3627bed73dcb7
 PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
 PKG_LICENSE_FILES:=COPYRIGHT
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libecdsautil
   SECTION:=libs

+ 1 - 2
utils/gammu/Makefile

@@ -21,11 +21,10 @@ PKG_LICENCE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/gammu
 	SECTION:=utils

+ 1 - 3
utils/mariadb/Makefile

@@ -25,8 +25,6 @@ PKG_LICENSE_FILES:=COPYING THIRDPARTY
 
 PKG_CPE_ID:=cpe:/a:mariadb:mariadb
 
-HOST_BUILD_PARALLEL:=1
-PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 HOST_BUILD_DEPENDS:=libxml2/host
@@ -168,8 +166,8 @@ MARIADB_SERVER_EXTRA := \
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/cmake.mk
 include $(INCLUDE_DIR)/nls.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 MARIADB_COMMON_DEPENDS := \
 	$(ICONV_DEPENDS) \

+ 1 - 1
utils/netwhere/Makefile

@@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_BUILD_DEPENDS:=boost
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/netwhere
   SECTION:=utils

+ 5 - 4
utils/openobex/Makefile

@@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:openobex:openobex
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/openobex/Default
   TITLE:=Open Source impl of the OBject EXchange protocol
@@ -54,10 +54,11 @@ $(call Package/openobex/Default)
 endef
 
 CMAKE_OPTIONS += \
-	-DBUILD_DOCUMENTATION:BOOL=OFF \
+	-DBUILD_DOCUMENTATION:BOOL=OFF
 
-MAKE_FLAGS += \
-	openobex openobex-apps \
+define Build/Compile
+	$(call Build/Compile/Default,openobex openobex-apps)
+endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include

+ 1 - 1
utils/rpcd-mod-lxc/Makefile

@@ -15,7 +15,7 @@ PKG_LICENSE:=ISC
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/rpcd-mod-lxc
   SECTION:=libs

+ 1 - 2
utils/rtl-sdr/Makefile

@@ -14,7 +14,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://git.osmocom.org/rtl-sdr/snapshot
 PKG_HASH:=ee10a76fe0c6601102367d4cdf5c26271e9442d0491aa8df27e5a9bf639cff7c
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPLv2
@@ -23,7 +22,7 @@ PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/rtl-sdr/Default
   TITLE:=Software Defined Radio with Realtek RTL2832U

+ 1 - 3
utils/rtl_433/Makefile

@@ -18,10 +18,8 @@ PKG_MAINTAINER:=Jasper Scholte <NightNL@outlook.com>
 PKG_LICENSE:=GPL-2.0-or-later
 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/rtl_433
   TITLE:=Realtek RTL2832 based 433.92MHz generic data receiver

+ 2 - 4
utils/rtty/Makefile

@@ -14,15 +14,13 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL=https://github.com/zhaojh329/rtty/releases/download/v$(PKG_VERSION)
 PKG_HASH:=9bc5d30dfa9bd664a62711b6229f47505b83adb364907f24e3a404aad52a4802
-CMAKE_INSTALL:=1
 
+PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/rtty/Default
   TITLE:=Access your terminals from anywhere via the web

+ 1 - 2
utils/sumo/Makefile

@@ -18,10 +18,9 @@ PKG_HASH:=fb0636152085153155ddb41841f0175c5f1e7989907b883f6c7453c63af49edb
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
 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/sumo
   SECTION:=utils

+ 1 - 4
utils/taskwarrior/Makefile

@@ -20,11 +20,8 @@ PKG_MAINTAINER:=
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/taskwarrior
   TITLE:=taskwarrior

+ 2 - 3
utils/telldus-core/Makefile

@@ -18,11 +18,10 @@ PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=LICENSE
 
 CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=0
-PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone
+PKG_BUILD_DEPENDS:=argp-standalone
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/telldus-core
 	SECTION:=utils

+ 3 - 5
utils/tini/Makefile

@@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=tini
 PKG_VERSION:=0.19.0
 PKG_RELEASE:=2
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/krallin/tini/tar.gz/v${PKG_VERSION}?
@@ -13,11 +11,11 @@ PKG_SOURCE_VERSION:=de40ad007797e0dcd8b7126f27bb87401d224240
 TINI_COMMIT:=de40ad0
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
-
-CMAKE_INSTALL:=1
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/tini
   SECTION:=utils

+ 1 - 3
utils/ttyd/Makefile

@@ -19,10 +19,8 @@ PKG_MAINTAINER:=Shuanglei Tao <tsl0922@gmail.com>
 PKG_LICENSE:=MIT
 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/ttyd
 	SECTION:=utils

+ 1 - 2
utils/uvcdynctrl/Makefile

@@ -19,11 +19,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/libwebcam-$(PKG_VERSION)
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=uvcdynctrl/COPYING
-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/uvcdynctrl
   SECTION:=utils