treewide: add ORIG_PATH variable

[openwrt/staging/hauke.git] / include / meson.mk

diff --git a/include/meson.mk b/include/meson.mk
index 9862f0e662b74b5b88440c7aa061363e5848b2f4..7d67dcf298b3e843049815878b53d69a67dcf9c0 100644 (file)
--- a/include/meson.mk
+++ b/include/meson.mk
@@ -56,7 +56,7 @@ MESON_CPU:="$(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))"
 endif
 
 define Meson
-       $(2) $(STAGING_DIR_HOST)/bin/meson $(1)
+       $(2) $(STAGING_DIR_HOST)/bin/$(PYTHON) $(STAGING_DIR_HOST)/bin/meson.py $(1)
 endef
 
 define Meson/CreateNativeFile
@@ -64,6 +64,8 @@ define Meson/CreateNativeFile
                -e "s|@CC@|$(foreach BIN,$(HOSTCC),'$(BIN)',)|" \
                -e "s|@CXX@|$(foreach BIN,$(HOSTCXX),'$(BIN)',)|" \
                -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
+               -e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \
+               -e "s|@PYTHON@|$(STAGING_DIR_HOST)/bin/python3|" \
                -e "s|@CFLAGS@|$(foreach FLAG,$(HOST_CFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \
                -e "s|@CXXFLAGS@|$(foreach FLAG,$(HOST_CXXFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \
                -e "s|@LDFLAGS@|$(foreach FLAG,$(HOST_LDFLAGS),'$(FLAG)',)|" \
@@ -80,6 +82,8 @@ define Meson/CreateCrossFile
                -e "s|@STRIP@|$(TARGET_CROSS)strip|" \
                -e "s|@NM@|$(TARGET_NM)|" \
                -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
+               -e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \
+               -e "s|@PYTHON@|$(STAGING_DIR_HOST)/bin/python3|" \
                -e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
                -e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
                -e "s|@LDFLAGS@|$(foreach FLAG,$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS),'$(FLAG)',)|" \
@@ -96,7 +100,7 @@ define Host/Configure/Meson
                --native-file $(HOST_BUILD_DIR)/openwrt-native.txt \
                $(MESON_HOST_ARGS) \
                $(MESON_HOST_BUILD_DIR) \
-               $(HOST_BUILD_DIR), \
+               $(MESON_HOST_BUILD_DIR)/.., \
                $(MESON_HOST_VARS))
 endef