From: bluhm <bluhm@openbsd.org>
Date: Sun, 27 Mar 2022 09:53:04 +0000 (+0000)
Subject: Revert previous.  Use private copy of zlib in Compress::Raw::Zlib
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f90d98f9f9ddb66fd5ea0c484ef1b391b8728a61;p=openbsd

Revert previous.  Use private copy of zlib in Compress::Raw::Zlib
again.  The header zlib.h in our base uses z_off_t for fields
total_in and total_out in struct z_stream_s.  The rest of the world
uses uLong there.  This leads to an incompatibility when comiled
with Perl.  The pkg tools fail on i386.
debugged by semarie@; discussed with tb@
---

diff --git a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/config.in b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/config.in
index 30d14a6b220..d6701ffb0cf 100644
--- a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/config.in
+++ b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/config.in
@@ -16,9 +16,9 @@
 #    Setting the Gzip OS Code
 #
 
-BUILD_ZLIB      = False
-INCLUDE         = /usr/include
-LIB             = /usr/lib
+BUILD_ZLIB      = True
+INCLUDE         = ./zlib-src
+LIB             = ./zlib-src
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT