| Message ID | 20250113134632.21592-1-alex_y_xu@yahoo.ca (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | meson: move config-list from libgit to builtin | expand |
On Mon, Jan 13, 2025, at 14:46, Alex Xu (Hello71) wrote: > config-list is used by builtin/help.c, not libgit. this matches Makefile > dependencies > > Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> > --- > meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > index 0064eb64f5..ef3604a17f 100644 > --- a/meson.build > +++ b/meson.build > @@ -614,7 +614,7 @@ libgit_sources += custom_target( > env: script_environment, > ) > > -libgit_sources += custom_target( > +builtin_sources += custom_target( Looks like the same change is in another patch from today https://lore.kernel.org/git/20250113-b4-pks-meson-additions-v1-3-97f6a93f691d@pks.im/
On Mon, Jan 13, 2025 at 03:17:08PM +0100, Kristoffer Haugsbakk wrote: > On Mon, Jan 13, 2025, at 14:46, Alex Xu (Hello71) wrote: > > config-list is used by builtin/help.c, not libgit. this matches Makefile > > dependencies > > > > Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> > > --- > > meson.build | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meson.build b/meson.build > > index 0064eb64f5..ef3604a17f 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -614,7 +614,7 @@ libgit_sources += custom_target( > > env: script_environment, > > ) > > > > -libgit_sources += custom_target( > > +builtin_sources += custom_target( > > Looks like the same change is in another patch from today > > https://lore.kernel.org/git/20250113-b4-pks-meson-additions-v1-3-97f6a93f691d@pks.im/ Yup, indeed :) I'd prefer to go with my series as it also contains a couple more additions, and because it also fixes the same issue for "hook-list.h". Thanks for your contribution! Patrick
diff --git a/meson.build b/meson.build index 0064eb64f5..ef3604a17f 100644 --- a/meson.build +++ b/meson.build @@ -614,7 +614,7 @@ libgit_sources += custom_target( env: script_environment, ) -libgit_sources += custom_target( +builtin_sources += custom_target( output: 'config-list.h', command: [ shell,
config-list is used by builtin/help.c, not libgit. this matches Makefile dependencies Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)