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

meson: use ninja from tools

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

2
devel/meson/Makefile
View file

@ -11,8 +11,6 @@ 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
HOST_BUILD_DEPENDS:=ninja/host
include ../../lang/python/pypi.mk include ../../lang/python/pypi.mk
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

13
devel/meson/meson.mk
View file

@ -24,7 +24,8 @@
# MESON_HOST_ARGS+=-Dfoo -Dbar=baz # MESON_HOST_ARGS+=-Dfoo -Dbar=baz
# MESON_HOST_VARS+=FOO=bar # MESON_HOST_VARS+=FOO=bar
include $(dir $(lastword $(MAKEFILE_LIST)))/../../devel/ninja/ninja.mk PKG_BUILD_PARALLEL ?= 1
HOST_BUILD_PARALLEL ?= 1
MESON_DIR:=$(STAGING_DIR_HOSTPKG)/lib/meson MESON_DIR:=$(STAGING_DIR_HOSTPKG)/lib/meson
@ -105,15 +106,15 @@ define Host/Configure/Meson
endef endef
define Host/Compile/Meson define Host/Compile/Meson
$(call Ninja,-C $(MESON_HOST_BUILD_DIR),) +$(NINJA) -C $(MESON_HOST_BUILD_DIR) $(1)
endef endef
define Host/Install/Meson define Host/Install/Meson
$(call Ninja,-C $(MESON_HOST_BUILD_DIR) install,) +$(NINJA) -C $(MESON_HOST_BUILD_DIR) install
endef endef
define Host/Uninstall/Meson define Host/Uninstall/Meson
-$(call Ninja,-C $(MESON_HOST_BUILD_DIR) uninstall,) +$(NINJA) -C $(MESON_HOST_BUILD_DIR) uninstall
endef endef
define Build/Configure/Meson define Build/Configure/Meson
@ -130,11 +131,11 @@ define Build/Configure/Meson
endef endef
define Build/Compile/Meson define Build/Compile/Meson
$(call Ninja,-C $(MESON_BUILD_DIR),) +$(NINJA) -C $(MESON_BUILD_DIR) $(1)
endef endef
define Build/Install/Meson define Build/Install/Meson
$(call Ninja,-C $(MESON_BUILD_DIR) install,DESTDIR="$(PKG_INSTALL_DIR)") +DESTDIR="$(PKG_INSTALL_DIR)" $(NINJA) -C $(MESON_BUILD_DIR) install
endef endef
Host/Configure=$(call Host/Configure/Meson) Host/Configure=$(call Host/Configure/Meson)