All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: Cherniaev Andrei <dungeonlords789@naver.com>
Cc: buildroot@buildroot.org,
	 Thomas Petazzoni <homas.petazzoni@bootlin.com>,
	 Eric Le Bihan <eric.le.bihan.dev@free.fr>
Subject: Re: [Buildroot] [PATCH 1/2] package/pkg-meson: change build sub-dir name
Date: Fri, 16 May 2025 11:41:34 +0200	[thread overview]
Message-ID: <87tt5kc2pd.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <20250309162614.2549737-1-dungeonlords789@naver.com> (Cherniaev Andrei's message of "Mon, 10 Mar 2025 01:26:11 +0900")

>>>>> "Cherniaev" == Cherniaev Andrei <dungeonlords789@naver.com> writes:

 > I encountered a situation where build/ is not empty folder so when all
 > files in build/ was removed by buildroot I was not able to use meson,
 > example https://gitlab.com/buildroot.org/buildroot/-/issues/64
 > The choice of "build" as the build sub-directorty is a bit stupid.

 > Co-Authored-By: Thomas Petazzoni <1089203+tpetazzoni@users.noreply.github.com>

You forgot to add your signed-off-by (git commit -s). Given how this is
just a replacement of build -> buildroot-build I took the liberty of
adding it here manually, hopefully that is OK with you?

Committed after rewording the commit message quite a bit, thanks.

> ---
 >  package/pkg-meson.mk | 26 +++++++++++++-------------
 >  1 file changed, 13 insertions(+), 13 deletions(-)

 > 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
 
 > -- 

 > 2.43.0

 > _______________________________________________
 > buildroot mailing list
 > buildroot@buildroot.org
 > https://lists.buildroot.org/mailman/listinfo/buildroot


-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  parent reply	other threads:[~2025-05-16  9:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-09 16:26 [Buildroot] [PATCH 1/2] package/pkg-meson: change build sub-dir name Cherniaev Andrei
2025-03-09 16:26 ` [Buildroot] [PATCH 2/2] package/libopenh264: switch to meson Cherniaev Andrei
2025-05-16  9:42   ` Peter Korsgaard
2025-05-16  9:41 ` Peter Korsgaard [this message]
2025-05-16 14:53   ` [Buildroot] [PATCH 1/2] package/pkg-meson: change build sub-dir name CHERNIAEV ANDREI
2025-05-31 16:47 ` Arnout Vandecappelle via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87tt5kc2pd.fsf@dell.be.48ers.dk \
    --to=peter@korsgaard.com \
    --cc=buildroot@buildroot.org \
    --cc=dungeonlords789@naver.com \
    --cc=eric.le.bihan.dev@free.fr \
    --cc=homas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.