diff options
| author | Rosen Penev <rosenp@gmail.com> | 2022-03-16 16:18:07 -0700 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-04-10 16:26:01 +0100 |
| commit | 0db5044f511650bb00a397de1cc63d7f4883a2f5 (patch) | |
| tree | f44c9cc4e707bd9f90bcfeb4b16beadad2cf8f30 /include/meson.mk | |
| parent | a650f4abfb306d131d2c8a14ec454ccd49101e47 (diff) | |
| download | upstream-0db5044f511650bb00a397de1cc63d7f4883a2f5.tar.gz upstream-0db5044f511650bb00a397de1cc63d7f4883a2f5.tar.bz2 upstream-0db5044f511650bb00a397de1cc63d7f4883a2f5.zip | |
tools/meson: update to 0.61.4
Override python to use the one in host instead of hostpkg. There's no
need to use the latter.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 19f3fcc884cab348cfba823f1175baf7aa4de15f)
Diffstat (limited to 'include/meson.mk')
| -rw-r--r-- | include/meson.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/meson.mk b/include/meson.mk index 102e74b542..7d67dcf298 100644 --- a/include/meson.mk +++ b/include/meson.mk @@ -65,6 +65,7 @@ define Meson/CreateNativeFile -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)',)|" \ @@ -82,6 +83,7 @@ define Meson/CreateCrossFile -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)',)|" \ |