diff --git a/lang/lua-cjson/Makefile b/lang/lua-cjson/Makefile index de727346a..8e8499acb 100644 --- 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 210b88ed3..ed7e5199f 100644 --- 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 c312c4a88..6dcc67a93 100644 --- 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 d6d320725..edc8f9fcd 100644 --- 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 b0e0a8a5e..2eaec58b4 100644 --- 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 e082eba3a..cf5f3841a 100644 --- 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 cc35bf1a3..7cd2da1c3 100644 --- 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 895060f2b..1115f271f 100644 --- 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 34dacd114..6372254e5 100644 --- 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 360fb8297..18234537a 100644 --- 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 d9723b969..0f15aeee6 100644 --- 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 bf888baf2..b74b24453 100644 --- 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 7c0735f28..5cab3d5f2 100644 --- 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 8065d40ed..2c55c380e 100644 --- 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 81fb22cf9..4e4438eaa 100644 --- 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 1f2e359b5..00b7a52be 100644 --- 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 eb6a14c6f..dddd8a1c5 100644 --- 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 59d5f4f26..e0bcf2619 100644 --- 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 9a91b51b8..33c91ac61 100644 --- a/libs/libiio/Makefile +++ b/libs/libiio/Makefile @@ -20,9 +20,6 @@ PKG_LICENSE_FILES:=COPYING.txt PKG_MAINTAINER:=Michael Heimpold -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 ac5b35280..d5c70b6eb 100644 --- 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 20d553695..d1ef6f529 100644 --- 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 8c29d8dfe..54b5b33bb 100644 --- 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 8f36d1c1e..eb5597694 100644 --- 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 c3909ed63..c7bb7375a 100644 --- 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 ec01225c5..e85c29021 100644 --- a/libs/libpqxx/Makefile +++ b/libs/libpqxx/Makefile @@ -14,7 +14,7 @@ CMAKE_INSTALL:=1 PKG_MAINTAINER:=Igor Bezzubchenko 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 d3959cab4..1d38e427d 100644 --- a/libs/libradiotap/Makefile +++ b/libs/libradiotap/Makefile @@ -18,10 +18,8 @@ PKG_MAINTAINER:=Nick Hainke 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 0fb1e3e71..8e35a655b 100644 --- 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 41cbf92bc..6c269eeae 100644 --- 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 d3f88ea22..8f102bef3 100644 --- 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 d747bfa2d..fa05b920b 100644 --- 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 12d3b2bd8..96f6db56a 100644 --- 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 24ec407ea..d0586db38 100644 --- a/libs/libtins/Makefile +++ b/libs/libtins/Makefile @@ -19,11 +19,10 @@ PKG_MAINTAINER:= Steven Hessing 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 57ca7a377..750cc2d0b 100644 --- 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 69c99cb5d..5e10abbf4 100644 --- a/libs/libuhttpd/Makefile +++ b/libs/libuhttpd/Makefile @@ -19,11 +19,10 @@ PKG_MAINTAINER:=Jianhui Zhao 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 303b26ba2..16988533a 100644 --- 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 042cf840d..bcf41d098 100644 --- 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 def4dc06d..258c99090 100644 --- 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 365e54128..d8dbdf944 100644 --- 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 ecd79de53..c9ebfc70b 100644 --- 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 bd9a54e10..ee214f21e 100644 --- a/libs/libxerces-c/Makefile +++ b/libs/libxerces-c/Makefile @@ -19,11 +19,9 @@ PKG_MAINTAINER:=Álvaro Fernández Rojas 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 b78a2dd27..139aa69d0 100644 --- 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 d7f375220..12a5e2154 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -18,11 +18,10 @@ PKG_MAINTAINER:=Michael Heimpold 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 09885e8d9..46400c775 100644 --- 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 aeb005f01..904081585 100644 --- a/libs/nghttp2/Makefile +++ b/libs/nghttp2/Makefile @@ -12,10 +12,8 @@ PKG_MAINTAINER:=Hans Dedecker 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 199013f20..efc8944d6 100644 --- 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 42d48269d..9039bfcac 100644 --- 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 d305c24bd..c5a36c219 100644 --- a/libs/qrencode/Makefile +++ b/libs/qrencode/Makefile @@ -19,11 +19,10 @@ PKG_MAINTAINER:=Jonathan Bennett 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 95c45d471..fbdfbb45e 100644 --- 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 d5018dbf9..3f1b5f0a3 100644 --- a/libs/uci2/Makefile +++ b/libs/uci2/Makefile @@ -13,10 +13,8 @@ PKG_MAINTAINER:=Jakov Petrina 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 3260c70f8..ea692c66a 100644 --- 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 d3972542d..1e313c4bc 100644 --- a/libs/yajl/Makefile +++ b/libs/yajl/Makefile @@ -20,11 +20,10 @@ PKG_MAINTAINER:=Charles Southerland 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 01a920b9d..fcefc6443 100644 --- 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 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 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 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 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 , \ 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 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 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=Stijn Tintel - 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 f9ed7f15a..6519e2026 100644 --- 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 4faf38bf9..9bd0df8dc 100644 --- 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 06d21bf49..1b45fdafc 100644 --- a/utils/canutils/Makefile +++ b/utils/canutils/Makefile @@ -20,10 +20,8 @@ PKG_MAINTAINER:=Anton Glukhov 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 c32da50e0..a7dc4a3a0 100644 --- 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 b4fe3208a..2d2005b90 100644 --- a/utils/ecdsautils/Makefile +++ b/utils/ecdsautils/Makefile @@ -19,11 +19,10 @@ PKG_MIRROR_HASH:=397395a471c0b5af1a173666ba21a5bedb4c3423a6e37c545c3627bed73dcb7 PKG_MAINTAINER:=Matthias Schiffer 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 75077ab1d..5ae8472a3 100644 --- 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 03bdd51c3..40919abe6 100644 --- 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 1de3a82a9..2258f2242 100644 --- 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 2501bfae6..8d4ccecd1 100644 --- 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 289b2d124..3448d7c15 100644 --- 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 1bd0ed0a6..2beaf877e 100644 --- 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 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 410ed1629..fe08c450f 100644 --- a/utils/rtl_433/Makefile +++ b/utils/rtl_433/Makefile @@ -18,10 +18,8 @@ PKG_MAINTAINER:=Jasper Scholte 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 bfc2d6470..6b0dbdd2e 100644 --- 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 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jianhui Zhao - 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 5a26c96b4..a16893d14 100644 --- a/utils/sumo/Makefile +++ b/utils/sumo/Makefile @@ -18,10 +18,9 @@ PKG_HASH:=fb0636152085153155ddb41841f0175c5f1e7989907b883f6c7453c63af49edb PKG_MAINTAINER:=Álvaro Fernández Rojas 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 35197b687..5e639e3dd 100644 --- 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 f7e46fc69..931ac0693 100644 --- 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 c7ad5bc2a..2f09b2660 100644 --- 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 - -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 c843801d1..947b62ed1 100644 --- a/utils/ttyd/Makefile +++ b/utils/ttyd/Makefile @@ -19,10 +19,8 @@ PKG_MAINTAINER:=Shuanglei Tao 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 2a735dc47..e3590f236 100644 --- a/utils/uvcdynctrl/Makefile +++ b/utils/uvcdynctrl/Makefile @@ -19,11 +19,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/libwebcam-$(PKG_VERSION) PKG_MAINTAINER:=Roger D 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