Browse Source

Merge pull request #13328 from neheb/ninja

ninja: use for CMake
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
5b8dd2d3b9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 1 deletions
  1. +1
    -1
      devel/ninja/Makefile
  2. +25
    -0
      devel/ninja/ninja-cmake.mk
  3. +3
    -0
      devel/ninja/ninja.mk

+ 1
- 1
devel/ninja/Makefile View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ninja PKG_NAME:=ninja
PKG_VERSION:=1.10.1 PKG_VERSION:=1.10.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ninja-build/ninja/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/ninja-build/ninja/tar.gz/v$(PKG_VERSION)?


+ 25
- 0
devel/ninja/ninja-cmake.mk View File

@ -0,0 +1,25 @@
include $(INCLUDE_DIR)/cmake.mk
include ../../devel/ninja/ninja.mk
CMAKE_HOST_OPTIONS += -DCMAKE_GENERATOR="Ninja"
CMAKE_OPTIONS += -DCMAKE_GENERATOR="Ninja"
define Host/Compile/Default
$(call Ninja,-C $(HOST_BUILD_DIR)/$(CMAKE_BINARY_SUBDIR),)
endef
define Host/Install/Default
$(call Ninja,-C $(HOST_BUILD_DIR)/$(CMAKE_BINARY_SUBDIR) install,DESTDIR="$(HOST_INSTALL_DIR)")
endef
define Host/Uninstall/Default
-$(call Ninja,-C $(HOST_BUILD_DIR)/$(CMAKE_BINARY_SUBDIR) uninstall,)
endef
define Build/Compile/Default
$(call Ninja,-C $(PKG_BUILD_DIR)/$(CMAKE_BINARY_SUBDIR),)
endef
define Build/Install/Default
$(call Ninja,-C $(PKG_BUILD_DIR)/$(CMAKE_BINARY_SUBDIR) install,DESTDIR="$(PKG_INSTALL_DIR)")
endef

+ 3
- 0
devel/ninja/ninja.mk View File

@ -6,6 +6,9 @@
# $(call Ninja,-C $(MY_NINJA_BUILD_DIR),$(MY_NINJA_ENV_VARS)) # $(call Ninja,-C $(MY_NINJA_BUILD_DIR),$(MY_NINJA_ENV_VARS))
# endef # endef
HOST_BUILD_DEPENDS += ninka/host
PKG_BUILD_DEPENDS += ninja/host
NINJA_ARGS:=$(filter -j%,$(filter-out -j,$(MAKEFLAGS))) NINJA_ARGS:=$(filter -j%,$(filter-out -j,$(MAKEFLAGS)))
ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
NINJA_ARGS+=-v NINJA_ARGS+=-v


Loading…
Cancel
Save