head 1.6; access; symbols pkgsrc-2024Q2:1.5.0.2 pkgsrc-2024Q2-base:1.5 pkgsrc-2023Q4:1.3.0.24 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.22 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.20 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.18 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.16 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.14 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.12 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.10 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.8 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.6 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.4 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.2 pkgsrc-2021Q1-base:1.3; locks; strict; comment @# @; 1.6 date 2024.06.27.07.18.49; author adam; state dead; branches; next 1.5; commitid p6mD06s3j69IJAfF; 1.5 date 2024.06.06.11.59.31; author jperkin; state Exp; branches; next 1.4; commitid qBQcCq3MEjtXXUcF; 1.4 date 2024.02.28.17.58.00; author adam; state dead; branches; next 1.3; commitid jCAlSiNizcn98e0F; 1.3 date 2021.01.17.09.36.45; author otis; state Exp; branches; next 1.2; commitid a3ghE8viFVBwT3EC; 1.2 date 2021.01.15.07.15.12; author schmonz; state Exp; branches; next 1.1; commitid 3LAC221SxT5FbNDC; 1.1 date 2021.01.12.21.06.20; author otis; state Exp; branches; next ; commitid f44yF759hHPDStDC; desc @@ 1.6 log @zziplib: updated to 0.13.77 release v0.13.77 * make afl to check for fuzzer bugs * update os versions to latest from docker_mirror.py * add missing tests scenarios for later os releases * fix Coverage include hack * integrate mxe/src/zziplib-2-prefer-win32-mmap.patch * make crossgcc/windows a working example for mingw * `./testbuilds.py clean` will drop test-related docker images * `./testbuilds.py` will automatically run clean if everything successful * `./testbuilds.py help` shows the available tests and commands * in test_2xx create /external bins and compile them by linking via cmake-configs * fix bins/CMakeLists.txt to show realistic usage of cmake find_package * note: it seems bins/unzzip*.c use internal headers which external programs can't @ text @$NetBSD: patch-zzip_CMakeLists.txt,v 1.5 2024/06/06 11:59:31 jperkin Exp $ Fix build when "gcov" is not available. --- zzip/CMakeLists.txt.orig 2024-06-06 11:53:41.297570014 +0000 +++ zzip/CMakeLists.txt @@@@ -13,7 +13,6 @@@@ include ( GNUInstallDirs ) include ( JoinPaths ) include ( CheckVerboseSymlink ) include ( CheckCCompilerFlag ) -include ( CodeCoverage ) # options ########################################################### option(BUILD_SHARED_LIBS "Build a shared library" ON) @@@@ -140,6 +139,7 @@@@ if(FORTIFY) endif() if(COVERAGE) +include ( CodeCoverage ) append_coverage_compiler_flags() endif() @ 1.5 log @zziplib: Fix build when "gcov" is not available. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @zziplib: updated to 0.13.73 release 0.13.73 * fixed last cmake bug - parallel builds can lead to race condition * abolished centos8 testbuilds and prepared ubuntu24 * integrated some github patches * prepare autoformat with clang-format (not yet enforced) @ text @d1 1 a1 1 $NetBSD: patch-zzip_CMakeLists.txt,v 1.3 2021/01/17 09:36:45 otis Exp $ d3 1 a3 1 Use portable ln switches. d5 1 a5 4 This is a backport of: https://github.com/gdraheim/zziplib/commit/eaba986ff3e6b29539d693fdab7189682dc72351 --- zzip/CMakeLists.txt.orig 2021-01-04 23:05:08.000000000 +0000 d7 9 a15 2 @@@@ -276,6 +276,22 @@@@ install(TARGETS libzzipmmapped ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) d18 3 a20 41 +if(ZZIP_COMPAT OR ZZIP_LIBTOOL) + if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + execute_process(COMMAND bash -c "ln --help" + OUTPUT_VARIABLE ln_verbose_help + ERROR_QUIET + ) + string(FIND "${ln_verbose_help}" "verbose" ln_verbose_found) + if(${ln_verbose_found} STREQUAL "-1") + set(ln_svf "ln -sf") + else() + set(ln_svf "ln -svf") + endif() + message(STATUS "Can symlink libraries with: ${ln_svf}") + endif() +endif() + if(ZZIP_COMPAT) install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) @@@@ -290,17 +306,17 @@@@ if(ZZIP_COMPAT) cd $DESTDIR/${libdir} if [ -f ${lib}${libname}${librelease}.${libversion}${dll} ]; then # Fix for APPLE where dylib goes in the end - ln -s ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} + ${ln_svf} ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} fi [ -f ${lib}${libname}${librelease}${dll}.${libversion} ] || exit 0 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll} + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll} echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 \")") endif() d22 1 a22 69 @@@@ -317,17 +333,17 @@@@ if(ZZIP_LIBTOOL) cd $DESTDIR/${libdir} if [ -f ${lib}${libname}${librelease}.${libversion}${dll} ]; then # Fix for APPLE where dylib goes in the end - ln -s ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} + ${ln_svf} ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} fi [ -f ${lib}${libname}${librelease}${dll}.${libversion} ] || exit 0 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${dll} + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${dll} echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 \")") if(ZZIPFSEEKO) get_target_property(libname libzzipfseeko OUTPUT_NAME) @@@@ -337,17 +353,17 @@@@ if(ZZIP_LIBTOOL) cd $DESTDIR/${libdir} if [ -f ${lib}${libname}${librelease}.${libversion}${dll} ]; then # Fix for APPLE where dylib goes in the end - ln -s ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} + ${ln_svf} ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} fi [ -f ${lib}${libname}${librelease}${dll}.${libversion} ] || exit 0 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${dll} + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${dll} echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 \")") endif(ZZIPFSEEKO) if(ZZIPMMAPPED) @@@@ -358,17 +374,17 @@@@ if(ZZIP_LIBTOOL) cd $DESTDIR/${libdir} if [ -f ${lib}${libname}${librelease}.${libversion}${dll} ]; then # Fix for APPLE where dylib goes in the end - ln -s ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} + ${ln_svf} ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} fi [ -f ${lib}${libname}${librelease}${dll}.${libversion} ] || exit 0 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${dll} + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${dll} echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 echo -n .. Installing: `pwd` - ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 + ${ln_svf} ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 \")") endif(ZZIPMMAPPED) endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) @ 1.3 log @archivers/zziplib: Use portable switches for ln Backport of upstream change. See https://github.com/gdraheim/zziplib/commit/eaba986ff3e6b29539d693fdab7189682dc72351 @ text @d1 1 a1 1 $NetBSD: patch-zzip_CMakeLists.txt,v 1.2 2021/01/15 07:15:12 schmonz Exp $ @ 1.2 log @Notably missing on macOS, with magic PLIST handling hiding its absence: libzzip.dylib. Pass -f along with ln -s in the APPLE cases, too, so none of the bash install scripts exit early due to ln giving "File exists". Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-zzip_CMakeLists.txt,v 1.1 2021/01/12 21:06:20 otis Exp $ d3 4 a6 1 Use portable ln switches d10 24 a33 1 @@@@ -290,17 +290,17 @@@@ if(ZZIP_COMPAT) d38 1 a38 1 + ln -sf ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} d43 1 a43 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll} d46 1 a46 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 d49 1 a49 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 d52 1 a52 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 d56 1 a56 1 @@@@ -317,17 +317,17 @@@@ if(ZZIP_LIBTOOL) d61 1 a61 1 + ln -sf ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} d66 1 a66 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${dll} d69 1 a69 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 d72 1 a72 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 d75 1 a75 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 d79 1 a79 1 @@@@ -337,17 +337,17 @@@@ if(ZZIP_LIBTOOL) d84 1 a84 1 + ln -sf ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} d89 1 a89 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${dll} d92 1 a92 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 d95 1 a95 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 d98 1 a98 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 d102 1 a102 1 @@@@ -358,17 +358,17 @@@@ if(ZZIP_LIBTOOL) d107 1 a107 1 + ln -sf ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion} d112 1 a112 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${dll} d115 1 a115 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10 d118 1 a118 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11 d121 1 a121 1 + ln -sf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12 @ 1.1 log @archivers/zziplib: Fix build on SmartOS Use portable switches to `ln' @ text @d1 1 a1 1 $NetBSD$ d7 6 a12 1 @@@@ -294,13 +294,13 @@@@ if(ZZIP_COMPAT) d30 6 a35 1 @@@@ -321,13 +321,13 @@@@ if(ZZIP_LIBTOOL) d53 6 a58 1 @@@@ -341,13 +341,13 @@@@ if(ZZIP_LIBTOOL) d76 6 a81 1 @@@@ -362,13 +362,13 @@@@ if(ZZIP_LIBTOOL) @