diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index bc805b799c..30271e35e5 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -147,12 +147,12 @@ $(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS) # # define $(2)_CONFIGURE_CMDS - rm -rf $$($$(PKG)_SRCDIR)/build - mkdir -p $$($$(PKG)_SRCDIR)/build + rm -rf $$($$(PKG)_SRCDIR)/buildroot-build + mkdir -p $$($$(PKG)_SRCDIR)/buildroot-build sed -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ -e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \ $$(call PKG_MESON_CROSSCONFIG_SED,$(2)_CFLAGS,$(2)_CXXFLAGS,$(2)_LDFLAGS,$(2)_FCFLAGS) \ - > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf + > $$($$(PKG)_SRCDIR)/buildroot-build/cross-compilation.conf PATH=$$(BR_PATH) \ CC_FOR_BUILD="$$(HOSTCC)" \ CXX_FOR_BUILD="$$(HOSTCXX)" \ @@ -162,21 +162,21 @@ define $(2)_CONFIGURE_CMDS --libdir=lib \ --default-library=$(PKG_MESON_DEFAULT_LIBRARY) \ --buildtype=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \ - --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \ + --cross-file=$$($$(PKG)_SRCDIR)/buildroot-build/cross-compilation.conf \ -Db_pie=false \ -Db_staticpic=$(if $(BR2_m68k_cf),false,true) \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ $$($$(PKG)_CONF_OPTS) \ - $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build + $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/buildroot-build endef else # Configure package for host define $(2)_CONFIGURE_CMDS - rm -rf $$($$(PKG)_SRCDIR)/build - mkdir -p $$($$(PKG)_SRCDIR)/build + rm -rf $$($$(PKG)_SRCDIR)/buildroot-build + mkdir -p $$($$(PKG)_SRCDIR)/buildroot-build $$(HOST_CONFIGURE_OPTS) \ $$($$(PKG)_CONF_ENV) $$(MESON) setup \ --prefix=$$(HOST_DIR) \ @@ -188,7 +188,7 @@ define $(2)_CONFIGURE_CMDS --wrap-mode=nodownload \ -Dstrip=true \ $$($$(PKG)_CONF_OPTS) \ - $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build + $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/buildroot-build endef endif endif @@ -203,12 +203,12 @@ ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ - $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build endef else define $(2)_BUILD_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ - $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build endef endif endif @@ -220,7 +220,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ - $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build install endef endif @@ -231,7 +231,7 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) \ - $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build install endef endif @@ -242,7 +242,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) \ - $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build install endef endif