From b40a139fbcf306ae9874a90b981cc138013d12dc Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 18 Apr 2020 00:01:28 -0700 Subject: [PATCH] meson: allow compilation in a subdirectory Small tweak to get it to build. Signed-off-by: Rosen Penev (cherry picked from commit e74498c97ac74bf4b6ae8eb55f53dcd3b1ba1dc2) --- devel/meson/Makefile | 2 +- devel/meson/meson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 9e5b32c3e2..ec836e8f58 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=meson PKG_VERSION:=0.54.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PYPI_NAME:=meson PKG_HASH:=dde5726d778112acbd4a67bb3633ab2ee75d33d1e879a6283a7b4a44c3363c27 diff --git a/devel/meson/meson.mk b/devel/meson/meson.mk index 069496c1a3..896a5d6d24 100644 --- a/devel/meson/meson.mk +++ b/devel/meson/meson.mk @@ -103,7 +103,7 @@ define Build/Configure/Meson --cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \ $(MESON_ARGS) \ $(MESON_BUILD_DIR) \ - $(PKG_BUILD_DIR), \ + $(MESON_BUILD_DIR)/.., \ $(MESON_VARS)) endef