summaryrefslogtreecommitdiff
path: root/libz
diff options
context:
space:
mode:
Diffstat (limited to 'libz')
-rw-r--r--libz/README-DEV4
-rw-r--r--libz/libz/buildfile17
-rw-r--r--libz/manifest3
-rw-r--r--libz/tests/minigzip/buildfile8
4 files changed, 13 insertions, 19 deletions
diff --git a/libz/README-DEV b/libz/README-DEV
index 79d7ad1..aa7874f 100644
--- a/libz/README-DEV
+++ b/libz/README-DEV
@@ -1,7 +1,3 @@
-TODO:
-
- - Try to re-enable warnings in case fixed.
-
This document describes how libz was packaged for build2. In particular, this
understanding will be useful when upgrading to a new upstream version. See
../README-DEV for general notes on zlib packaging.
diff --git a/libz/libz/buildfile b/libz/libz/buildfile
index 3851db4..0103711 100644
--- a/libz/libz/buildfile
+++ b/libz/libz/buildfile
@@ -61,16 +61,13 @@ switch $c.class
#
c.coptions += -Wno-all -Wno-extra
- if ($c.id == 'clang')
- {
- if ($c.version.major >= 15)
- c.coptions += -Wno-deprecated-non-prototype
-
- # Disable the Clang targeting MSVC warnings.
- #
- if ($tsys == 'win32-msvc')
- c.coptions += -Wno-deprecated-declarations
- }
+ if ($c.id.type == 'clang' && $c.version.major >= 15)
+ c.coptions += -Wno-deprecated-non-prototype
+
+ # Disable the Clang targeting MSVC warnings.
+ #
+ if ($c.id == 'clang' && $tsys == 'win32-msvc')
+ c.coptions += -Wno-deprecated-declarations
}
case 'msvc'
{
diff --git a/libz/manifest b/libz/manifest
index 67535dc..b2668bb 100644
--- a/libz/manifest
+++ b/libz/manifest
@@ -1,9 +1,8 @@
: 1
name: libz
-version: 1.2.1200+3
+version: 1.2.1200+4
upstream-version: 1.2.12
project: zlib
-priority: security
summary: General-purpose lossless data compression C library
license: Zlib ; Permissive free software license.
topics: C, data compression
diff --git a/libz/tests/minigzip/buildfile b/libz/tests/minigzip/buildfile
index 9419fa1..c58e902 100644
--- a/libz/tests/minigzip/buildfile
+++ b/libz/tests/minigzip/buildfile
@@ -7,13 +7,15 @@ exe{driver}: {h c}{*} $libs testscript
# Disable MSVC warnings that pop up with /W3 and Clang warnings.
#
+# @@ TMP: try to re-enable on next release.
+#
if ($c.class == 'msvc')
c.coptions += /wd4267 /wd4996
-elif ($c.id == 'clang')
+else
{
- if ($c.version.major >= 15)
+ if ($c.id.type == 'clang' && $c.version.major >= 15)
c.coptions += -Wno-deprecated-non-prototype
- if ($c.target.system == 'win32-msvc')
+ if ($c.id == 'clang' && $c.target.system == 'win32-msvc')
c.coptions += -Wno-deprecated-declarations
}