[Buildroot] [PATCH 1/1] package/postgresql: add patch to disable docs build

[Buildroot] [PATCH 1/1] package/postgresql: add patch to disable docs build

[Maxim Kochetkov via buildroot]

docbook package is needed for building docs. Build fails without it
if xmllint is found on host:

I/O error : Attempt to load network entity: http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd
../doc/src/sgml/postgres.sgml:22: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
]>
  ^
../doc/src/sgml/postgres.sgml:24: element book: validity error : No declaration for attribute id of element book
<book id="postgres">
                   ^

So disable docs build.

Fixes: https://autobuild.buildroot.org/results/711c101d9a4807fcb59cff2b7c89454f96cc3e2d/
Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
---
 ...ld-drop-docs-build-from-world-target.patch | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/postgresql/0001-meson.build-drop-docs-build-from-world-target.patch

diff --git a/package/postgresql/0001-meson.build-drop-docs-build-from-world-target.patch b/package/postgresql/0001-meson.build-drop-docs-build-from-world-target.patch
new file mode 100644
index 0000000000..92ddbf7da6
--- /dev/null
+++ b/package/postgresql/0001-meson.build-drop-docs-build-from-world-target.patch
@@ -0,0 +1,34 @@
+From 304889951e5fd2b40864770ef2432c83b68c0c1a Mon Sep 17 00:00:00 2001
+From: Maxim Kochetkov <fido_max@inbox.ru>
+Date: Tue, 10 Dec 2024 13:55:09 +0300
+Subject: [PATCH 1/1] meson.build: drop docs build from "world" target
+
+"world" target is used to compile all the PG extensions and
+plugins. There is no way to disable documentation builds for
+"world" target. However documentation needs a lot of extra
+xml/sgml/docbook tools, schemas etc...
+So let's just drop docs tarets.
+
+Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 005dc9f353..2504a3c8f5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3588,8 +3588,8 @@ alias_target('pl', pl_targets)
+ alias_target('contrib', contrib_targets)
+ alias_target('testprep', testprep_targets)
+ 
+-alias_target('world', all_built, docs)
+-alias_target('install-world', install_quiet, installdocs)
++alias_target('world', all_built)
++alias_target('install-world', install_quiet)
+ 
+ run_target('help',
+   command: [
+-- 
+2.45.2
+
-- 
2.45.2

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

Re: [Buildroot] [PATCH 1/1] package/postgresql: add patch to disable docs build

[Julien Olivain]

Hi Maxim,

Thanks for the patch!

On 10/12/2024 16:42, Maxim Kochetkov via buildroot wrote:
> docbook package is needed for building docs. Build fails without it
> if xmllint is found on host:
> 
> I/O error : Attempt to load network entity: 
> http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd
> ../doc/src/sgml/postgres.sgml:22: warning: failed to load external 
> entity "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
> ]>
>   ^
> ../doc/src/sgml/postgres.sgml:24: element book: validity error : No 
> declaration for attribute id of element book
> <book id="postgres">
>                    ^
> 
> So disable docs build.

It seems postgresql is not always failing. In some situations,
it can build. See for example:
https://gitlab.com/buildroot.org/buildroot/-/jobs/8580182027

I also see that the PostgreSQL meson build system provides option
to build the docs. See:
https://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=meson_options.txt;h=246cecf382712d94157856d6d5403f6d0fc13148;hb=6304632eaa2107bb1763d29e213ff166ff6104c0#l88

Did you try to always disable docs by setting those options to false
in _CONF_OPTS?

For example, setting:

     POSTGRESQL_CONF_OPTS = \
         -Ddocs=false \
         -Ddocs_pdf=false \
         -Drpath=false

See:
https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/postgresql/postgresql.mk#L17


> Fixes: 
> https://autobuild.buildroot.org/results/711c101d9a4807fcb59cff2b7c89454f96cc3e2d/
> Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
> ---
>  ...ld-drop-docs-build-from-world-target.patch | 34 +++++++++++++++++++
>  1 file changed, 34 insertions(+)
>  create mode 100644 
> package/postgresql/0001-meson.build-drop-docs-build-from-world-target.patch
> 
> diff --git 
> a/package/postgresql/0001-meson.build-drop-docs-build-from-world-target.patch 
> b/package/postgresql/0001-meson.build-drop-docs-build-from-world-target.patch
> new file mode 100644
> index 0000000000..92ddbf7da6
> --- /dev/null
> +++ 
> b/package/postgresql/0001-meson.build-drop-docs-build-from-world-target.patch
> @@ -0,0 +1,34 @@
> +From 304889951e5fd2b40864770ef2432c83b68c0c1a Mon Sep 17 00:00:00 2001
> +From: Maxim Kochetkov <fido_max@inbox.ru>
> +Date: Tue, 10 Dec 2024 13:55:09 +0300
> +Subject: [PATCH 1/1] meson.build: drop docs build from "world" target
> +
> +"world" target is used to compile all the PG extensions and
> +plugins. There is no way to disable documentation builds for
> +"world" target. However documentation needs a lot of extra
> +xml/sgml/docbook tools, schemas etc...
> +So let's just drop docs tarets.
> +
> +Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
> +---
> + meson.build | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/meson.build b/meson.build
> +index 005dc9f353..2504a3c8f5 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -3588,8 +3588,8 @@ alias_target('pl', pl_targets)
> + alias_target('contrib', contrib_targets)
> + alias_target('testprep', testprep_targets)
> +
> +-alias_target('world', all_built, docs)
> +-alias_target('install-world', install_quiet, installdocs)
> ++alias_target('world', all_built)
> ++alias_target('install-world', install_quiet)
> +
> + run_target('help',
> +   command: [
> +--
> +2.45.2
> +
> --
> 2.45.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

Best regards,

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

Re: [Buildroot] [PATCH 1/1] package/postgresql: add patch to disable docs build

[Maxim Kochetkov via buildroot]

11.12.2024 02:00, Julien Olivain wrote:
> Hi Maxim,
> 
> Thanks for the patch!
> 
> On 10/12/2024 16:42, Maxim Kochetkov via buildroot wrote:
>> docbook package is needed for building docs. Build fails without it
>> if xmllint is found on host:
>>
>> I/O error : Attempt to load network entity: http://www.oasis-open.org/ 
>> docbook/xml/4.5/docbookx.dtd
>> ../doc/src/sgml/postgres.sgml:22: warning: failed to load external 
>> entity "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
>> ]>
>>   ^
>> ../doc/src/sgml/postgres.sgml:24: element book: validity error : No 
>> declaration for attribute id of element book
>> <book id="postgres">
>>                    ^
>>
>> So disable docs build.
> 
> It seems postgresql is not always failing. In some situations,
> it can build. See for example:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/8580182027

Yep. It fails if xmllint was found.

xmllint_bin = find_program(get_option('XMLLINT'), native: true, 
required: false)

> 
> I also see that the PostgreSQL meson build system provides option
> to build the docs. See:
> https://git.postgresql.org/gitweb/? 
> p=postgresql.git;a=blob;f=meson_options.txt;h=246cecf382712d94157856d6d5403f6d0fc13148;hb=6304632eaa2107bb1763d29e213ff166ff6104c0#l88
> 
> Did you try to always disable docs by setting those options to false
> in _CONF_OPTS?
> 
> For example, setting:
> 
>      POSTGRESQL_CONF_OPTS = \
>          -Ddocs=false \
>          -Ddocs_pdf=false \
>          -Drpath=false

Yes I did. That was my very first try. It does not help. Because "world" 
target wants to build docs unconditionally.


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

Re: [Buildroot] [PATCH 1/1] package/postgresql: add patch to disable docs build

[Julien Olivain]

Hi Maxim,

On 11/12/2024 00:00, Julien Olivain wrote:
> Hi Maxim,
> 
> Thanks for the patch!
> 
> On 10/12/2024 16:42, Maxim Kochetkov via buildroot wrote:
>> docbook package is needed for building docs. Build fails without it
>> if xmllint is found on host:
>> 
>> I/O error : Attempt to load network entity: 
>> http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd
>> ../doc/src/sgml/postgres.sgml:22: warning: failed to load external 
>> entity "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
>> ]>
>>   ^
>> ../doc/src/sgml/postgres.sgml:24: element book: validity error : No 
>> declaration for attribute id of element book
>> <book id="postgres">
>>                    ^
>> 
>> So disable docs build.
> 
> It seems postgresql is not always failing. In some situations,
> it can build. See for example:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/8580182027
> 
> I also see that the PostgreSQL meson build system provides option
> to build the docs. See:
> https://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=meson_options.txt;h=246cecf382712d94157856d6d5403f6d0fc13148;hb=6304632eaa2107bb1763d29e213ff166ff6104c0#l88
> 
> Did you try to always disable docs by setting those options to false
> in _CONF_OPTS?
> 
> For example, setting:
> 
>     POSTGRESQL_CONF_OPTS = \
>         -Ddocs=false \
>         -Ddocs_pdf=false \
>         -Drpath=false
> 
> See:
> https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/postgresql/postgresql.mk#L17

For info, I applied the patch from Thomas, see:
https://gitlab.com/buildroot.org/buildroot/-/commit/f0422b41df9d5b638b59ffc9811f9bce135f3e35

There is indeed an upstream bug.

Best regards,

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