diff options
| -rw-r--r-- | libz/README-DEV | 4 | ||||
| -rw-r--r-- | libz/libz/buildfile | 17 | ||||
| -rw-r--r--[l---------] | libz/libz/zlib.map | 100 | ||||
| l--------- | libz/libz/zlib.map.orig | 1 | ||||
| -rw-r--r-- | libz/libz/zlib.map.patch | 10 | ||||
| -rw-r--r-- | libz/manifest | 3 | ||||
| -rw-r--r-- | libz/tests/minigzip/buildfile | 8 |
7 files changed, 123 insertions, 20 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/libz/zlib.map b/libz/libz/zlib.map index 21c37cf..df26ca6 120000..100644 --- a/libz/libz/zlib.map +++ b/libz/libz/zlib.map @@ -1 +1,99 @@ -../../upstream/zlib.map
\ No newline at end of file +ZLIB_1.2.0 { + global: + compressBound; + deflateBound; + inflateBack; + inflateBackEnd; + inflateBackInit_; + inflateCopy; + local: + deflate_copyright; + inflate_copyright; + inflate_fast; + inflate_table; + zcalloc; + zcfree; + z_errmsg; + gz_error; + _*; +}; + +ZLIB_1.2.0.2 { + gzclearerr; + gzungetc; + zlibCompileFlags; +} ZLIB_1.2.0; + +ZLIB_1.2.0.8 { + deflatePrime; +} ZLIB_1.2.0.2; + +ZLIB_1.2.2 { + adler32_combine; + crc32_combine; + deflateSetHeader; + inflateGetHeader; +} ZLIB_1.2.0.8; + +ZLIB_1.2.2.3 { + deflateTune; + gzdirect; +} ZLIB_1.2.2; + +ZLIB_1.2.2.4 { + inflatePrime; +} ZLIB_1.2.2.3; + +ZLIB_1.2.3.3 { + adler32_combine64; + crc32_combine64; + gzopen64; + gzseek64; + gztell64; + inflateUndermine; +} ZLIB_1.2.2.4; + +ZLIB_1.2.3.4 { + inflateReset2; + inflateMark; +} ZLIB_1.2.3.3; + +ZLIB_1.2.3.5 { + gzbuffer; + gzoffset; + gzoffset64; + gzclose_r; + gzclose_w; +} ZLIB_1.2.3.4; + +ZLIB_1.2.5.1 { + deflatePending; +} ZLIB_1.2.3.5; + +ZLIB_1.2.5.2 { + deflateResetKeep; + gzgetc_; + inflateResetKeep; +} ZLIB_1.2.5.1; + +ZLIB_1.2.7.1 { + inflateGetDictionary; + gzvprintf; +} ZLIB_1.2.5.2; + +ZLIB_1.2.9 { + inflateCodesUsed; + inflateValidate; + uncompress2; + gzfread; + gzfwrite; + deflateGetDictionary; + adler32_z; + crc32_z; +} ZLIB_1.2.7.1; + +ZLIB_1.2.12 { + crc32_combine_gen; + crc32_combine_gen64; + crc32_combine_op; +} ZLIB_1.2.9; diff --git a/libz/libz/zlib.map.orig b/libz/libz/zlib.map.orig new file mode 120000 index 0000000..21c37cf --- /dev/null +++ b/libz/libz/zlib.map.orig @@ -0,0 +1 @@ +../../upstream/zlib.map
\ No newline at end of file diff --git a/libz/libz/zlib.map.patch b/libz/libz/zlib.map.patch new file mode 100644 index 0000000..fedec07 --- /dev/null +++ b/libz/libz/zlib.map.patch @@ -0,0 +1,10 @@ +--- zlib.map.orig 2022-04-11 15:05:00.013248773 +0200 ++++ zlib.map 2024-06-05 07:42:47.415065314 +0200 +@@ -15,7 +15,6 @@ + zcfree; + z_errmsg; + gz_error; +- gz_intmax; + _*; + }; + diff --git a/libz/manifest b/libz/manifest index 67535dc..44f6e5b 100644 --- a/libz/manifest +++ b/libz/manifest @@ -1,9 +1,8 @@ : 1 name: libz -version: 1.2.1200+3 +version: 1.2.1200+5 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 } |