Обсуждение: meson: catalog/syscache_ids.h isn't installed
Hi, catalog/syscache_ids.h is referred by utils/syscache.h but it's not installed with Meson. FYI: * 9b1a6f50b91dca6610932650c8c81a3c924259f9 It uses catalog/syscache_ids.h in utils/syscache.h but catalog/syscache_ids.h isn't installed. * 6eb6086faa3842c2a38a1ee2f97bf9a42ce27610 It changes a Makefile to install catalog/syscache_ids.h but it doesn't change meson.build. ---- diff --git a/src/include/catalog/meson.build b/src/include/catalog/meson.build index 6be76dca1d..0bf6e112d5 100644 --- a/src/include/catalog/meson.build +++ b/src/include/catalog/meson.build @@ -114,7 +114,7 @@ output_install = [ dir_data, dir_data, dir_include_server / 'catalog', - false, + dir_include_server / 'catalog', dir_include_server / 'catalog', dir_include_server / 'catalog', ] ---- Thanks, -- kou
On Mon, Feb 5, 2024 at 10:29 AM Sutou Kouhei <kou@clear-code.com> wrote: > > Hi, > > catalog/syscache_ids.h is referred by utils/syscache.h but > it's not installed with Meson. > > FYI: > * 9b1a6f50b91dca6610932650c8c81a3c924259f9 > It uses catalog/syscache_ids.h in utils/syscache.h but > catalog/syscache_ids.h isn't installed. > * 6eb6086faa3842c2a38a1ee2f97bf9a42ce27610 > It changes a Makefile to install catalog/syscache_ids.h but > it doesn't change meson.build. > > ---- > diff --git a/src/include/catalog/meson.build b/src/include/catalog/meson.build > index 6be76dca1d..0bf6e112d5 100644 > --- a/src/include/catalog/meson.build > +++ b/src/include/catalog/meson.build > @@ -114,7 +114,7 @@ output_install = [ > dir_data, > dir_data, > dir_include_server / 'catalog', > - false, > + dir_include_server / 'catalog', > dir_include_server / 'catalog', > dir_include_server / 'catalog', > ] > ---- > Thank you for reporting the issue and the patch. I've confirmed this patch fixes the issue. But I don't have enough knowledge of meson to assess this fix. Peter, could you check this fix as it seems the recent commits forgot to update the meson.build file? Regards, -- Masahiko Sawada Amazon Web Services: https://aws.amazon.com
On Mon, Feb 05, 2024 at 03:55:36PM +0900, Masahiko Sawada wrote: > I've confirmed this patch fixes the issue. But I don't have enough > knowledge of meson to assess this fix. > > Peter, could you check this fix as it seems the recent commits forgot > to update the meson.build file? The patched code is telling us that we're forgetting to install syscache_ids.h in the set of headers that should be part of the server-side includes installed. In short, Sutou-san is right, this is the right fix, and this is a thinko from 9b1a6f50b91d. -- Michael
Вложения
On 2024-Feb-05, Michael Paquier wrote: > On Mon, Feb 05, 2024 at 03:55:36PM +0900, Masahiko Sawada wrote: > > Peter, could you check this fix as it seems the recent commits forgot > > to update the meson.build file? > > The patched code is telling us that we're forgetting to install > syscache_ids.h in the set of headers that should be part of the > server-side includes installed. In short, Sutou-san is right, this > is the right fix, and this is a thinko from 9b1a6f50b91d. What the original rule said was that the file should be installed in 'false', and now we want it installed in include/catalog. So the oversight is that the original commit seems to have said that we didn't want the file installed (that's what 'false' means), which is a strange decision. The docs here https://mesonbuild.com/Reference-manual_functions.html#custom_target_install_dir seem to explain this well. -- Álvaro Herrera Breisgau, Deutschland — https://www.EnterpriseDB.com/ "But static content is just dynamic content that isn't moving!" http://smylers.hates-software.com/2007/08/15/fe244d0c.html
On 05.02.24 02:29, Sutou Kouhei wrote: > catalog/syscache_ids.h is referred by utils/syscache.h but > it's not installed with Meson. This has been fixed. (Somebody else reported it in a different thread also.)
Hi, In <4b60e9bd-426c-4d4b-bbbd-1abd06fa05b9@eisentraut.org> "Re: meson: catalog/syscache_ids.h isn't installed" on Mon, 5 Feb 2024 17:53:52 +0100, Peter Eisentraut <peter@eisentraut.org> wrote: > On 05.02.24 02:29, Sutou Kouhei wrote: >> catalog/syscache_ids.h is referred by utils/syscache.h but >> it's not installed with Meson. > > This has been fixed. (Somebody else reported it in a different thread > also.) Thanks! Commit: 1ae5ace7558ea949d2f94af2fd5eb145d5558659 Thread: https://www.postgresql.org/message-id/CAJ7c6TMDGmAiozDjJQ3%3DP3cd-1BidC_GpitcAuU0aqq-r1eSoQ%40mail.gmail.com -- kou