CVS commit: pkgsrc/devel/zlib

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Oct 24 04:36:04 UTC 2025

Modified Files:
        pkgsrc/devel/zlib: builtin.mk

Log Message:
devel/zlib: Work around zconf.h bug in NetBSD.

Even if the zconf.h bug is fixed in NetBSD release branches, we need
to work around this in pkgsrc for netbsd<11 binary package builds
that are made against the x.0 release which doesn't have the fix.

This will also require a revbump of all packages that potentially use
zlib builtin.mk to guarantee it takes effect in incremental package
builds.

PR lib/59711: "#define HAVE_UNISTD_H 1" breaks 32-bit libz


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/zlib/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/zlib/builtin.mk
diff -u pkgsrc/devel/zlib/builtin.mk:1.19 pkgsrc/devel/zlib/builtin.mk:1.20
--- pkgsrc/devel/zlib/builtin.mk:1.19   Thu Feb  8 21:33:34 2024
+++ pkgsrc/devel/zlib/builtin.mk        Fri Oct 24 04:36:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.19 2024/02/08 21:33:34 adam Exp $
+# $NetBSD: builtin.mk,v 1.20 2025/10/24 04:36:04 riastradh Exp $
 
 BUILTIN_PKG:=  zlib
 
@@ -86,6 +86,14 @@ CHECK_BUILTIN.zlib?= no
 .if ${CHECK_BUILTIN.zlib:tl} == no
 .  if ${USE_BUILTIN.zlib:tl} == yes
 
+# Work around PR lib/59711: "#define HAVE_UNISTD_H 1" breaks 32-bit
+# libz.  Must be fixed in pkgsrc for binary package builds against x.0
+# releases (e.g., 9.0) because the system header file is wrong.
+# Practically, this probably only affects big-endian LP32 platforms.
+.    if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 110000
+BUILDLINK_CPPFLAGS.zlib+=      -Dz_off_t=long
+.    endif
+
 BUILDLINK_TARGETS+=    fake-zlib-pc
 
 _FAKE_ZLIB_PC= ${BUILDLINK_DIR}/lib/pkgconfig/zlib.pc