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>

diff --git a/lang/lua-cjson/Makefile b/lang/lua-cjson/Makefile
index de727346a8686d75456f07cee8ee6a9440da7f4b..8e8499acbf58413020c8a7ee26f827eadf41f41a 100644 (file)
--- a/lang/lua-cjson/Makefile
+++ b/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

diff --git a/lang/lzmq/Makefile b/lang/lzmq/Makefile
index 210b88ed3c715f2ac954a18e284c26833c34827e..ed7e5199f884464fa55038796ec5831484322104 100644 (file)
--- a/lang/lzmq/Makefile
+++ b/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

diff --git a/libs/afalg_engine/Makefile b/libs/afalg_engine/Makefile
index c312c4a8848ed3105c91b4b561d61a598940e598..6dcc67a93782f656a22b3a1aea8c6edb3d197f46 100644 (file)
--- a/libs/afalg_engine/Makefile
+++ b/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
 

diff --git a/libs/c-ares/Makefile b/libs/c-ares/Makefile
index d6d320725d1be8f48af97416d0cef59abd8cdaf8..edc8f9fcdcf982b063ecbb6554c6016f4a0ff293 100644 (file)
--- a/libs/c-ares/Makefile
+++ b/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

diff --git a/libs/cereal/Makefile b/libs/cereal/Makefile
index b0e0a8a5e96d66df16316ea5c22e93f1e18dafac..2eaec58b44f381453bd9acf9992c1ee9f0ec1125 100644 (file)
--- a/libs/cereal/Makefile
+++ b/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 \

diff --git a/libs/cjson/Makefile b/libs/cjson/Makefile
index e082eba3aaf0d954e51e15720e8e022b164fa769..cf5f3841a528af342e026bbb1461a8695e1661cc 100644 (file)
--- a/libs/cjson/Makefile
+++ b/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

diff --git a/libs/czmq/Makefile b/libs/czmq/Makefile
index cc35bf1a3f4761f9bba03e9be673a92ef862fe68..7cd2da1c3da0c1a565e6e5cc702639382b1fc790 100644 (file)
--- a/libs/czmq/Makefile
+++ b/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

diff --git a/libs/elektra/Makefile b/libs/elektra/Makefile
index 895060f2bc93c61ad229811b7bd5ee1d70a313ea..1115f271f72112fe1cf1a0a0db1a34553b4bc347 100644 (file)
--- a/libs/elektra/Makefile
+++ b/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 \

diff --git a/libs/expat/Makefile b/libs/expat/Makefile
index 34dacd11403f612fda3ff65ea449f5edc61ac543..6372254e563c1a8616197bfb1f4c96ec324b26dd 100644 (file)
--- a/libs/expat/Makefile
+++ b/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

diff --git a/libs/getdns/Makefile b/libs/getdns/Makefile
index 360fb8297d5e6d31a6f9f6f714642093e0d645b9..18234537ae681773e073b5b9b02c77b4751298f1 100644 (file)
--- a/libs/getdns/Makefile
+++ b/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

diff --git a/libs/h2o/Makefile b/libs/h2o/Makefile
index d9723b969f20265122600b0f2f0681d68102137c..0f15aeee6ceaa3acc691b76922b69dcf6d726cb7 100644 (file)
--- a/libs/h2o/Makefile
+++ b/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
 

diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile
index bf888baf270962ab744f55b8fb7d52d3fd7b61ef..b74b244530cc39fe7d3a971378fa1bf07c75f8a0 100644 (file)
--- a/libs/libarchive/Makefile
+++ b/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

diff --git a/libs/libcbor/Makefile b/libs/libcbor/Makefile
index 7c0735f28f8367f599bd87f6dc9a0e5e2a07e5c4..5cab3d5f282805f2ce839bf4fe754d0c78275b22 100644 (file)
--- a/libs/libcbor/Makefile
+++ b/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

diff --git a/libs/libevhtp/Makefile b/libs/libevhtp/Makefile
index 8065d40ed139aa48334cd9d8f316f3be810376e3..2c55c380ef1da3e50a9222ad2071001301cb6cb1 100644 (file)
--- a/libs/libevhtp/Makefile
+++ b/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

diff --git a/libs/libfido2/Makefile b/libs/libfido2/Makefile
index 81fb22cf9434aa0cadde41fc158d24bdb9855a7f..4e4438eaa0f414e6d87ff094340db96d67713bd7 100644 (file)
--- a/libs/libfido2/Makefile
+++ b/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

diff --git a/libs/libfmt/Makefile b/libs/libfmt/Makefile
index 1f2e359b5f96af1e202d86f76a40598cf7a3a246..00b7a52be54effa878eb75fbe519aae006fbc61a 100644 (file)
--- a/libs/libfmt/Makefile
+++ b/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

diff --git a/libs/libftdi/Makefile b/libs/libftdi/Makefile
index eb6a14c6ff7d13454ba7f5adaab53da2a36dfe2e..dddd8a1c5e40e696294830c0f0a18b28dbc4b6a3 100644 (file)
--- a/libs/libftdi/Makefile
+++ b/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

diff --git a/libs/libftdi1/Makefile b/libs/libftdi1/Makefile
index 59d5f4f260420a4a95678575c9e8eaf70dd8ba56..e0bcf2619483ef72a1e36a24eeee2bc6018cdccb 100644 (file)
--- a/libs/libftdi1/Makefile
+++ b/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

diff --git a/libs/libiio/Makefile b/libs/libiio/Makefile
index 9a91b51b8aecdbbdff45ee0a3ad2a8cc59ab652d..33c91ac6173790d9b32005806c7eef28aca668aa 100644 (file)
--- a/libs/libiio/Makefile
+++ b/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)

diff --git a/libs/libjpeg-turbo/Makefile b/libs/libjpeg-turbo/Makefile
index ac5b352800eba9dff5c4ca8703e6cc56b34ae233..d5c70b6eb001f9f937d1c165f3924d841d98fdcd 100644 (file)
--- a/libs/libjpeg-turbo/Makefile
+++ b/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

diff --git a/libs/liblo/Makefile b/libs/liblo/Makefile
index 20d5536954c93ea5a4d30d186df3e7ee9717b0d5..d1ef6f5298a38eb36539c254e93267d7866249ed 100644 (file)
--- a/libs/liblo/Makefile
+++ b/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)

diff --git a/libs/libmraa/Makefile b/libs/libmraa/Makefile
index 8c29d8dfe9fca3d8ac8673147caa63e52f5018c3..54b5b33bb526c1198a6d21b325b1903e3e57d203 100644 (file)
--- a/libs/libmraa/Makefile
+++ b/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
 

diff --git a/libs/libnatpmp/Makefile b/libs/libnatpmp/Makefile
index 8f36d1c1e20c2ae62f756dc7aec6d247daaef3de..eb55976947570b9ef39fcbd76a999f621a7ac599 100644 (file)
--- a/libs/libnatpmp/Makefile
+++ b/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)

diff --git a/libs/libnatpmp/patches/010-cmake.patch b/libs/libnatpmp/patches/010-cmake.patch
index c3909ed63df8ded5bef91f35c5e3904f406c0cd7..c7bb7375a2f90bde5be4f874eefcad19e3603b0e 100644 (file)
--- a/libs/libnatpmp/patches/010-cmake.patch
+++ b/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

diff --git a/libs/libpqxx/Makefile b/libs/libpqxx/Makefile
index ec01225c5820f8f15954ba9ca0d88b1ede3b8164..e85c29021751ef1ba6ef2538a11cfb3ebdbb6d9d 100644 (file)
--- a/libs/libpqxx/Makefile
+++ b/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

diff --git a/libs/libradiotap/Makefile b/libs/libradiotap/Makefile
index d3959cab422cd86c4b92a7f114bd05a27d5af3a4..1d38e427d0d5ed6e4ea060730e413730a191a02e 100644 (file)
--- a/libs/libradiotap/Makefile
+++ b/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

diff --git a/libs/libroxml/Makefile b/libs/libroxml/Makefile
index 0fb1e3e71f512e37205f6535df7d2eb25bd391ac..8e35a655b456b34ea0e3bbc6f27ef3c0f9dcceb0 100644 (file)
--- a/libs/libroxml/Makefile
+++ b/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

diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile
index 41cbf92bc0f3e50c6db3d54906ca9ce73d41bc8d..6c269eeae2840f2a211a9820b5d9efd442abc2d6 100644 (file)
--- a/libs/libsndfile/Makefile
+++ b/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

diff --git a/libs/libsoxr/Makefile b/libs/libsoxr/Makefile
index d3f88ea2252a6fc229cbc6422aa8eb629790b4b6..8f102bef3ed2cea437e36b3c4dc3b049a55740b7 100644 (file)
--- a/libs/libsoxr/Makefile
+++ b/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

diff --git a/libs/libssh/Makefile b/libs/libssh/Makefile
index d747bfa2def4bfdcb424ab189e8fcf96b4e02817..fa05b920bf3dd3e0b8982ca661b2e2112786c817 100644 (file)
--- a/libs/libssh/Makefile
+++ b/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 \

diff --git a/libs/libssh2/Makefile b/libs/libssh2/Makefile
index 12d3b2bd86782fb4cae3269bfbb96b24b2eb9afe..96f6db56a783233ad8996eb53476a84840c5e45a 100644 (file)
--- a/libs/libssh2/Makefile
+++ b/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

diff --git a/libs/libtins/Makefile b/libs/libtins/Makefile
index 24ec407ea7f61114e7f0fbb1e97eee15963a4b78..d0586db380c419c3b50645e85bc3f33a464b6643 100644 (file)
--- a/libs/libtins/Makefile
+++ b/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

diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile
index 57ca7a377f6ab5847f4f27e7d1a5ad71a5d7561e..750cc2d0bb35ccdfc90ff2a79e0f0a4e05a812ff 100644 (file)
--- a/libs/libuecc/Makefile
+++ b/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

diff --git a/libs/libuhttpd/Makefile b/libs/libuhttpd/Makefile
index 69c99cb5dd3ddcabac288e21d4b17c5873f607e5..5e10abbf40543a999e1b6e1b9ba2ada34ab2ab45 100644 (file)
--- a/libs/libuhttpd/Makefile
+++ b/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

diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile
index 303b26ba28dd483d15ff870bfb5738f9369272dd..16988533aee59f0cad6f08daa0ecfed68ed86081 100644 (file)
--- a/libs/libupm/Makefile
+++ b/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 \
 

diff --git a/libs/libvorbis/Makefile b/libs/libvorbis/Makefile
index 042cf840dbc25a08dbcd77c96a3f88586c5ef215..bcf41d0984068069362895c00d9b924bc84ec54a 100644 (file)
--- a/libs/libvorbis/Makefile
+++ b/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

diff --git a/libs/libwebp/Makefile b/libs/libwebp/Makefile
index def4dc06dfb58f3508a3bfce6ee14038a55c19ef..258c990902eb0e7a716e0a8935cfce48fc33d43c 100644 (file)
--- a/libs/libwebp/Makefile
+++ b/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

diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile
index 365e541283c29f862d7ea90e17dd8ac34d94ce2c..d8dbdf94499925a730bdd5eab120a2eb53e63023 100644 (file)
--- a/libs/libwebsockets/Makefile
+++ b/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

diff --git a/libs/libwslay/Makefile b/libs/libwslay/Makefile
index ecd79de536957ec50f62002d5aa33b1e441b4d7c..c9ebfc70bb3fefc2b590cb311ab24a838d52366a 100644 (file)
--- a/libs/libwslay/Makefile
+++ b/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

diff --git a/libs/libxerces-c/Makefile b/libs/libxerces-c/Makefile
index bd9a54e10761e5122d677fa0f186f646f07131b6..ee214f21e4b1962f916df5e15ee83c4b78ce2d5c 100644 (file)
--- a/libs/libxerces-c/Makefile
+++ b/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

diff --git a/libs/libyaml-cpp/Makefile b/libs/libyaml-cpp/Makefile
index b78a2dd277df097827e9597e64d1b345a43dc9cd..139aa69d0f549c67fdc35f7c2b20d831ca3e649d 100644 (file)
--- a/libs/libyaml-cpp/Makefile
+++ b/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

diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile
index d7f37522066fe50d985f1a9f2fa1de2d13b11642..12a5e21542e3525dce5b62b0f02b1a24de7f5bf8 100644 (file)
--- a/libs/libzip/Makefile
+++ b/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))

diff --git a/libs/lzo/Makefile b/libs/lzo/Makefile
index 09885e8d9b72618d2b3c4bd54593e326dc8045d4..46400c7755d0ca95e2adc7daf0528275d57756a1 100644 (file)
--- a/libs/lzo/Makefile
+++ b/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

diff --git a/libs/nghttp2/Makefile b/libs/nghttp2/Makefile
index aeb005f014ce1d0ca4fb6d3a47548e5759f1383e..9040815858418087804c3132fae2890ea00fa5d4 100644 (file)
--- a/libs/nghttp2/Makefile
+++ b/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

diff --git a/libs/pcre2/Makefile b/libs/pcre2/Makefile
index 199013f206e6bc74b5d98dd70d1c30a5fdf540f7..efc8944d69b4cea2d9a5fe7c04022fdc186a5202 100644 (file)
--- a/libs/pcre2/Makefile
+++ b/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

diff --git a/libs/protobuf-c/Makefile b/libs/protobuf-c/Makefile
index 42d48269dc0506f3370cb996f025bda71810c43c..9039bfcac197a76aa800a46f7256bed79a2850ab 100644 (file)
--- a/libs/protobuf-c/Makefile
+++ b/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

diff --git a/libs/qrencode/Makefile b/libs/qrencode/Makefile
index d305c24bd53e7abc6db8e4c828a30a809fd67667..c5a36c2199852286e3cb9c289eaebd0ac652efb3 100644 (file)
--- a/libs/qrencode/Makefile
+++ b/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

diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
index 95c45d4717b643edb353bb576c7dec862aa3442e..fbdfbb45ede6dde11c2aad51a415f92d87b42300 100644 (file)
--- a/libs/tiff/Makefile
+++ b/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

diff --git a/libs/uci2/Makefile b/libs/uci2/Makefile
index d5018dbf904614ca70fab43dd56fc58d833428d0..3f1b5f0a3a14a105bb5464020fc10e5374aa5316 100644 (file)
--- a/libs/uci2/Makefile
+++ b/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

diff --git a/libs/websocketpp/Makefile b/libs/websocketpp/Makefile
index 3260c70f82dd52c02fa98a4587db386caabaf77f..ea692c66adba3c9e57ee663212acc693f8eba497 100644 (file)
--- a/libs/websocketpp/Makefile
+++ b/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
 

diff --git a/libs/yajl/Makefile b/libs/yajl/Makefile
index d3972542d676c2ca1055c856b38b827b3ad7f72c..1e313c4bc308378132c519c08a881d021f36148d 100644 (file)
--- a/libs/yajl/Makefile
+++ b/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

diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile
index 01a920b9df8b9bbcf0553b74fa43c5f9b55ce562..fcefc6443b8137912a947f0ea204a74a69673c48 100644 (file)
--- a/libs/zmq/Makefile
+++ b/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

diff --git a/net/apfree-wifidog/Makefile b/net/apfree-wifidog/Makefile
index 31334fb8e6299d4b9153e28c1449b97eccd04bc7..4fa2ebb1ab99d9c9d4a8541e9884fe6905c26602 100644 (file)
--- 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 9384a1b72be68c74cffc92dab50dfafbe80cca30..3b6ca337f336c0ed99c69279612194aa52feb8cf 100644 (file)
--- 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 3adb15316484d9678d0598b23d9d96df66dd5a72..abb59769a95f16615b595fbce0880eb0d7772ecf 100644 (file)
--- 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 25ebd0745a751754f2eafa9f46f907930e639aa2..2178cd8b13d9551cecbf9ed1365cd2362c9da7a7 100644 (file)
--- 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 19897f7a6514514dd59b61c60b0474befa81c4f9..a62705d4d66b2c567ea12d0483a8819e1f1d6bde 100644 (file)
--- 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 80e802b17b4d0fad1b5559c4d623730089300e39..9a8b4f9411e18feb1702bf10345ea004dded7ccc 100644 (file)
--- 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 54eb8bf876d22f37c11a298f03dde71d6e5fc66e..980b5ddce048edcfdef938b841028bad9fa4307f 100644 (file)
--- 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 9e3a8ba75ecc8445d613b2725509cc78676b3887..d3a27573e16d2740db0f2986d92b6d089b9220f6 100644 (file)
--- 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 298625f649cdb5d6ff8d18a182466c433ddc6fa4..4c9cd618418613aa8a61300fc7cf072f2247dc6e 100644 (file)
--- 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 4530596a82a3f715b78749913997b2e7582c7b03..24e1ead5012a5fb9ef22b7a7e33fbbce6b12b71e 100644 (file)
--- 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 1c08ab6bdf4da6cdaa9d2060a9702727181b80ab..f9dca573939e9c982ccadf2c6db2ed2deb56e271 100644 (file)
--- 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 37641046bed9ca63291a346c3e3eaa7e35d53378..04032a467f8d7901c377e5a0aa948061dacd4c6c 100644 (file)
--- 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 739e33e39eb020964bcfc0e010d9b5a86702a093..0fa02d87a2f996ec32f4b89780ce07bc1e0dedba 100644 (file)
--- 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 dd4811b269492a4def52fa9fd7d4c61bb359762d..7277bf721c902a9b98f8119a2cf73abd2dab19a5 100644 (file)
--- 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

diff --git a/sound/portaudio/Makefile b/sound/portaudio/Makefile
index f9ed7f15aeaf2454f768c2b412a028e3ac2b85cd..6519e20269a2a47b043b2671f95537182b70cdf4 100644 (file)
--- a/sound/portaudio/Makefile
+++ b/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

diff --git a/utils/auc/Makefile b/utils/auc/Makefile
index 4faf38bf9c0c9c6f1e17e0a31b2ddd4dfa067d07..9bd0df8dcfd6b83ef536abd34ac1881c491346a4 100644 (file)
--- a/utils/auc/Makefile
+++ b/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

diff --git a/utils/canutils/Makefile b/utils/canutils/Makefile
index 06d21bf49ad208b45704fe237411c6ef92defd00..1b45fdafc033360ab64d71106b7b4042eea23caf 100644 (file)
--- a/utils/canutils/Makefile
+++ b/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

diff --git a/utils/domoticz/Makefile b/utils/domoticz/Makefile
index c32da50e061e907ae76768957fb477747c2845c7..a7dc4a3a04f1c7d4abf46b8cf637c303fde73540 100644 (file)
--- a/utils/domoticz/Makefile
+++ b/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 \

diff --git a/utils/ecdsautils/Makefile b/utils/ecdsautils/Makefile
index b4fe3208a4c613b0e77fa68a3507fbccdf749fe1..2d2005b90db415bae2d0b513545346e8291f58b3 100644 (file)
--- a/utils/ecdsautils/Makefile
+++ b/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

diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile
index 75077ab1d86b20431ba6281e57630c849a621662..5ae8472a3538adbe47db729c789d8b1853b9cecd 100644 (file)
--- a/utils/gammu/Makefile
+++ b/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

diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile
index 03bdd51c3c8e62fc090d61473f4b1fdcf940036e..40919abe62331980ea4ed36e06a741a51cdb3f6a 100644 (file)
--- a/utils/mariadb/Makefile
+++ b/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) \

diff --git a/utils/netwhere/Makefile b/utils/netwhere/Makefile
index 1de3a82a91f6739a7aa84acb95fe1a7ee45ccb83..2258f224208a461d4552ed9a4be692cbc6fa46bd 100644 (file)
--- a/utils/netwhere/Makefile
+++ b/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

diff --git a/utils/openobex/Makefile b/utils/openobex/Makefile
index 2501bfae6df6e29385fd5c72842e5bea3cdaa82b..8d4ccecd1e8f035f9837d6733928ef7fef78bb5c 100644 (file)
--- a/utils/openobex/Makefile
+++ b/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

diff --git a/utils/rpcd-mod-lxc/Makefile b/utils/rpcd-mod-lxc/Makefile
index 289b2d1241a137d0ab178e6ace8701d544eeebb7..3448d7c1559e0d59f5161ac407e24727c77c0a64 100644 (file)
--- a/utils/rpcd-mod-lxc/Makefile
+++ b/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

diff --git a/utils/rtl-sdr/Makefile b/utils/rtl-sdr/Makefile
index 1bd0ed0a6c288250e6cf4b057017a07a1e7dedb9..2beaf877e2b748bca00dca250e0ca98d43c27fce 100644 (file)
--- a/utils/rtl-sdr/Makefile
+++ b/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

diff --git a/utils/rtl_433/Makefile b/utils/rtl_433/Makefile
index 410ed16290edf8f2bd9e0c7d0dced3c7b07d7048..fe08c450f117b3fa7c164b94e2c54c449892ec79 100644 (file)
--- a/utils/rtl_433/Makefile
+++ b/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

diff --git a/utils/rtty/Makefile b/utils/rtty/Makefile
index bfc2d647066965ad7f6dac6f2b0e698bb434945a..6b0dbdd2eb4dc0eafc1fd3aeeebb5337f66a7d30 100644 (file)
--- a/utils/rtty/Makefile
+++ b/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

diff --git a/utils/sumo/Makefile b/utils/sumo/Makefile
index 5a26c96b40397e6e673096eac3959e836d43492b..a16893d145977273d89e0a657a40123517bec948 100644 (file)
--- a/utils/sumo/Makefile
+++ b/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

diff --git a/utils/taskwarrior/Makefile b/utils/taskwarrior/Makefile
index 35197b687c6ac5f8c73c5ac58fcb0a5335c7f6ac..5e639e3dddc0c981b9992eec6245325b8a022e14 100644 (file)
--- a/utils/taskwarrior/Makefile
+++ b/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

diff --git a/utils/telldus-core/Makefile b/utils/telldus-core/Makefile
index f7e46fc693d849c588ecedcc8bb8fb687faab157..931ac06935a4aebb5a040879c4c02306a55b10cf 100644 (file)
--- a/utils/telldus-core/Makefile
+++ b/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

diff --git a/utils/tini/Makefile b/utils/tini/Makefile
index c7ad5bc2a5485db5e32134c253f5e4f0035788ae..2f09b26608a84da9b367f323e3e977fe84fec344 100644 (file)
--- a/utils/tini/Makefile
+++ b/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

diff --git a/utils/ttyd/Makefile b/utils/ttyd/Makefile
index c843801d16d0d73ddcc4e2f34789783eae0268fc..947b62ed1c2b0eb868fa93c9b83ff4d3813da5a9 100644 (file)
--- a/utils/ttyd/Makefile
+++ b/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

diff --git a/utils/uvcdynctrl/Makefile b/utils/uvcdynctrl/Makefile
index 2a735dc470ac420fa22dc559aad27ce1911d06e0..e3590f236282c04cf31715a748d61cc265986e0b 100644 (file)
--- a/utils/uvcdynctrl/Makefile
+++ b/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