Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ninja: remove host build.

Browse source 
There's tools/ninja now, with jobserver support.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2021-06-13 18:28:29 -07:00
parent b3510c69dd
commit a1f8300492
2 changed files with 2 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
devel/ninja/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ninja PKG_NAME:=ninja
PKG_VERSION:=1.10.2 PKG_VERSION:=1.10.2
PKG_RELEASE:=2 PKG_RELEASE:=3
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)?
@ -12,38 +12,13 @@ PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DEPENDS:=ninja/host
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ./ninja.mk
CONFIGURE_ARGS:= CONFIGURE_ARGS:=
ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
CONFIGURE_ARGS+=--verbose CONFIGURE_ARGS+=--verbose
endif 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 define Package/ninja
SECTION:=devel SECTION:=devel
CATEGORY:=Development CATEGORY:=Development
@ -70,8 +45,7 @@ define Build/Configure
endef endef
define Build/Compile define Build/Compile
$(call Ninja,-C $(PKG_BUILD_DIR),) +$(NINJA) -C $(PKG_BUILD_DIR) $(1)
endef endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,ninja)) $(eval $(call BuildPackage,ninja))

19
devel/ninja/ninja.mk
View file

@ -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