threads / patch / 62371

patchmeson: fix meson build on 'seen' branch

Subject: [PATCH] meson: fix meson build on 'seen' branch

## tl;dr

4 messages between Oct 20, 2024 and Oct 23, 2024. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Ramsay Jones· Oct 20, 2024, 00:54 UTC · lore
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Hi Taylor, Patrick,

I tested the v3 patches on the base mentioned in the cover letter without issues. In the interim, I noticed that the v3 patches had been queued on the 'seen' branch. I tested with make, as usual, then with meson (on Linux). This patch was required to fix the meson build (just in case you weren't already aware, although I suspect you are!).

ATB, Ramsay Jones

 meson.build          | 3 +++
 t/helper/meson.build | 1 +
 2 files changed, 4 insertions(+)
Show changes to 2 files +4 −0

meson.build, t/helper/meson.build

diff --git a/meson.build b/meson.build
index 7c7a59d7fb..c057039ec0 100644
--- a/meson.build
+++ b/meson.build
@@ -65,6 +65,8 @@ libgit_sources = [
   'commit-graph.c',
   'commit-reach.c',
   'commit.c',
+  'common-exit.c',
+  'common-init.c',
   'compat/nonblock.c',
   'compat/obstack.c',
   'compat/terminal.c',
@@ -178,6 +180,7 @@ libgit_sources = [
   'patch-delta.c',
   'patch-ids.c',
   'path.c',
+  'path-walk.c',
   'pathspec.c',
   'pkt-line.c',
   'preload-index.c',
diff --git a/t/helper/meson.build b/t/helper/meson.build
index 5e83884246..f502d1aaa3 100644
--- a/t/helper/meson.build
+++ b/t/helper/meson.build
@@ -40,6 +40,7 @@ test_tool_sources = [
   'test-parse-pathspec-file.c',
   'test-partial-clone.c',
   'test-path-utils.c',
+  'test-path-walk.c',
   'test-pcre2-config.c',
   'test-pkt-line.c',
   'test-proc-receive.c',
-- 
2.47.0
Taylor Blau· Oct 21, 2024, 22:02 UTC · re: Ramsay Jones · lore

Re: [PATCH] meson: fix meson build on 'seen' branch

On Sun, Oct 20, 2024 at 01:54:47AM +0100, Ramsay Jones wrote:
Show 11 quoted lines
>
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Taylor, Patrick,
>
> I tested the v3 patches on the base mentioned in the cover letter
> without issues. In the interim, I noticed that the v3 patches had
> been queued on the 'seen' branch. I tested with make, as usual, then
> with meson (on Linux). This patch was required to fix the meson build
> (just in case you weren't already aware, although I suspect you are!).
Thanks. It would be nice to have this folded into Patrick's branch.
Patrick: thoughts?

Thanks, Taylor

Patrick Steinhardt· Oct 23, 2024, 09:05 UTC · re: Taylor Blau · lore

Re: [PATCH] meson: fix meson build on 'seen' branch

On Mon, Oct 21, 2024 at 06:02:57PM -0400, Taylor Blau wrote:
Show 15 quoted lines
> On Sun, Oct 20, 2024 at 01:54:47AM +0100, Ramsay Jones wrote:
> >
> > Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> > ---
> >
> > Hi Taylor, Patrick,
> >
> > I tested the v3 patches on the base mentioned in the cover letter
> > without issues. In the interim, I noticed that the v3 patches had
> > been queued on the 'seen' branch. I tested with make, as usual, then
> > with meson (on Linux). This patch was required to fix the meson build
> > (just in case you weren't already aware, although I suspect you are!).
> 
> Thanks. It would be nice to have this folded into Patrick's branch.
> Patrick: thoughts?

Yeah, I'll pick these up with v4 of this patch series. I'll also try to make sure next time around that things work cleanly with "seen" and pick up dependencies as required.

Patrick
Taylor Blau· Oct 23, 2024, 20:25 UTC · re: Patrick Steinhardt · lore

Re: [PATCH] meson: fix meson build on 'seen' branch

On Wed, Oct 23, 2024 at 11:05:19AM +0200, Patrick Steinhardt wrote:
Show 20 quoted lines
> On Mon, Oct 21, 2024 at 06:02:57PM -0400, Taylor Blau wrote:
> > On Sun, Oct 20, 2024 at 01:54:47AM +0100, Ramsay Jones wrote:
> > >
> > > Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> > > ---
> > >
> > > Hi Taylor, Patrick,
> > >
> > > I tested the v3 patches on the base mentioned in the cover letter
> > > without issues. In the interim, I noticed that the v3 patches had
> > > been queued on the 'seen' branch. I tested with make, as usual, then
> > > with meson (on Linux). This patch was required to fix the meson build
> > > (just in case you weren't already aware, although I suspect you are!).
> >
> > Thanks. It would be nice to have this folded into Patrick's branch.
> > Patrick: thoughts?
>
> Yeah, I'll pick these up with v4 of this patch series. I'll also try to
> make sure next time around that things work cleanly with "seen" and pick
> up dependencies as required.
Thanks, both.

Thanks, Taylor

← back to recent threads