Re: CVS commit: pkgsrc/databases/gdbm

[Aleksey Cheusov <vle%gmx.net@localhost>]

 >> On May 1, 2024 10:37:28 PM UTC, Jonathan Perkin <jperkin%mnx.io@localhost> wrote:
 >>
 >>> Again, all of these changes are wrong.  The buildlink3 logic must
 >>> match that of the package, including checking PKG_BUILD_OPTIONS.
 >>>
 >>> All of these commits are just breaking every package that depends
 >>> on them.
 >>
 >> Could you explain please what exactly is wrong? I tested my changes
 >> on NetBSD and Linux with and without nls option. Everything worked
 >> just fine.

> The pkglint warning you should have gotten when running before commit
> explains it quite well:

>   $ cd databases/gdbm
>   $ pkglint -e
>   WARN: buildlink3.mk:13: "../../devel/gettext-lib/buildlink3.mk" is included unconditionally here and conditionally in options.mk:14 (depending on PKG_OPTIONS).

>       When including a dependent file, the conditions in the buildlink3.mk
>       file should be the same as in options.mk or the Makefile.

>       To find out the PKG_OPTIONS of this package at build time, have a
>       look at mk/pkg-build-options.mk.

> Includes in buildlink3.mk MUST match the binary package, otherwise you
> will get all of the errors I linked to in the daily bulk build
I overlooked this warning. Thanks!

So, the fix for gdbm and python311 should the following. Right?

Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/gdbm/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- buildlink3.mk       19 Nov 2020 02:57:11 -0000      1.14
+++ buildlink3.mk       2 May 2024 07:58:51 -0000
@@ -10,7 +10,9 @@
 BUILDLINK_PKGSRCDIR.gdbm?=     ../../databases/gdbm

 .include "../../converters/libiconv/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.gdbm:Mnls}
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif
 .endif # GDBM_BUILDLINK3_MK

 BUILDLINK_TREE+=       -gdbm


lang/python311:

Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python311/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- buildlink3.mk       29 Nov 2023 11:02:41 -0000      1.2
+++ buildlink3.mk       2 May 2024 08:02:51 -0000
@@ -19,7 +19,6 @@
 .if !${BUILDLINK_DEPMETHOD.python311:U:Mbuild}
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 .endif

 .endif # PYTHON311_BUILDLINK3_MK