| Message ID | 12325bcd-fc3b-4d2a-9ec5-20fa2b50297b@ramsayjones.plus.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | meson: fix meson build on 'seen' branch | expand |
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? Thanks, Taylor
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. Patrick
On Wed, Oct 23, 2024 at 11:05:19AM +0200, Patrick Steinhardt wrote: > 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
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',
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(+)