diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-06-13 18:28:29 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2021-06-21 01:16:54 -0700 |
| commit | a1f8300492f0b091142252da3f22dcf3eb3b5840 (patch) | |
| tree | c00ebf91a387279a3c15d175acdf8e82ac0aec30 /devel | |
| parent | b3510c69dd1a3bf60ec4e4e9e359a9e3be8f4608 (diff) | |
ninja: remove host build.
There's tools/ninja now, with jobserver support.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ninja/Makefile | 30 | ||||
| -rw-r--r-- | devel/ninja/ninja.mk | 19 |
2 files changed, 2 insertions, 47 deletions
diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile index 96181cb87..f2ea423fd 100644 --- a/devel/ninja/Makefile +++ b/devel/ninja/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ninja PKG_VERSION:=1.10.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ninja-build/ninja/tar.gz/v$(PKG_VERSION)? @@ -12,38 +12,13 @@ PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com> PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DEPENDS:=ninja/host - -include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk -include ./ninja.mk CONFIGURE_ARGS:= ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) CONFIGURE_ARGS+=--verbose endif -define Host/Configure -endef - -define Host/Compile - cd $(HOST_BUILD_DIR) && \ - CXX="$(HOSTCXX)" \ - CXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - $(STAGING_DIR_HOST)/bin/$(PYTHON) configure.py --bootstrap $(CONFIGURE_ARGS) -endef - -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin - $(INSTALL_BIN) $(HOST_BUILD_DIR)/ninja $(STAGING_DIR_HOSTPKG)/bin/ -endef - -define Host/Clean - $(call Host/Clean/Default) - rm -f $(STAGING_DIR_HOSTPKG)/bin/ninja -endef - define Package/ninja SECTION:=devel CATEGORY:=Development @@ -70,8 +45,7 @@ define Build/Configure endef define Build/Compile - $(call Ninja,-C $(PKG_BUILD_DIR),) + +$(NINJA) -C $(PKG_BUILD_DIR) $(1) endef -$(eval $(call HostBuild)) $(eval $(call BuildPackage,ninja)) diff --git a/devel/ninja/ninja.mk b/devel/ninja/ninja.mk deleted file mode 100644 index 3be870141..000000000 --- a/devel/ninja/ninja.mk +++ /dev/null @@ -1,19 +0,0 @@ -# To execute ninja from you package's Makefile: -# -# include ../../devel/ninja/ninja.mk -# -# define Build/Compile -# $(call Ninja,-C $(MY_NINJA_BUILD_DIR),$(MY_NINJA_ENV_VARS)) -# endef - -HOST_BUILD_DEPENDS += ninja/host -PKG_BUILD_DEPENDS += ninja/host - -NINJA_ARGS:=$(filter -j%,$(filter-out -j,$(MAKEFLAGS))) -ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) - NINJA_ARGS+=-v -endif - -define Ninja - $(2) $(STAGING_DIR_HOSTPKG)/bin/ninja $(NINJA_ARGS) $(1) -endef |