Thread (100 messages) 100 messages, 4 authors, 2022-01-13

[PATCH] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c

STALE1726d

From: Carlo Marcelo Arenas Belón <hidden>
Date: 2021-09-02 06:12:34
Subsystem: the rest · Maintainer: Linus Torvalds

OpenBSD 7.0 (currently in beta) comes with zlib 1.2.11 and no longer needs
this compatibility layer.

Signed-off-by: Carlo Marcelo Arenas Belón <redacted>
---
 config.mak.uname | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/config.mak.uname b/config.mak.uname
index 019c88d5df..e3b7343ed2 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -256,7 +256,10 @@ ifeq ($(uname_S),FreeBSD)
 	FILENO_IS_A_MACRO = UnfortunatelyYes
 endif
 ifeq ($(uname_S),OpenBSD)
-	NO_UNCOMPRESS2 = YesPlease
+	# Versions < 7.0 need compatibility layer
+	ifeq ($(shell expr "$(uname_R)" : "[1-6]\."),2)
+		NO_UNCOMPRESS2 = UnfortunatelyYes
+	endif
 	NO_STRCASESTR = YesPlease
 	NO_MEMMEM = YesPlease
 	USE_ST_TIMESPEC = YesPlease
-- 
2.33.0.481.g26d3bed244
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help