Fri Aug 25 07:12:41 2023 UTC ()
libzip: fix testing on Darwin
(adam)
diff -r1.66 -r1.67 pkgsrc/archivers/libzip/Makefile
diff -r1.45 -r1.46 pkgsrc/archivers/libzip/distinfo
diff -r1.2 -r1.3 pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in
--- pkgsrc/archivers/libzip/Makefile 2023/08/24 07:12:34 1.66
+++ pkgsrc/archivers/libzip/Makefile 2023/08/25 07:12:41 1.67
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2023/08/24 07:12:34 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2023/08/25 07:12:41 adam Exp $
DISTNAME= libzip-1.10.1
CATEGORIES= archivers devel
@@ -18,6 +18,8 @@
# for tests
CMAKE_ARGS+= -DNIHTEST=${PREFIX}/bin/nihtest-${PYVERSSUFFIX}
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
+# for Darwin
+MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
PYTHON_VERSIONS_INCOMPATIBLE= 27
--- pkgsrc/archivers/libzip/distinfo 2023/08/24 07:12:34 1.45
+++ pkgsrc/archivers/libzip/distinfo 2023/08/25 07:12:41 1.46
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.45 2023/08/24 07:12:34 wiz Exp $
+$NetBSD: distinfo,v 1.46 2023/08/25 07:12:41 adam Exp $
BLAKE2s (libzip-1.10.1.tar.xz) = 50440c37f0e3deaa55846c5d3dc122563ebfc79ca1ad96cc8648f9e7480aad68
SHA512 (libzip-1.10.1.tar.xz) = d24670ca3fa5def0345d6c531045683f11a124af7975dd724eae3bf3128a62fb8185a3d4df029c7c8232c7584e5ac55d18c431dc53b91e992fbbc8d119442930
Size (libzip-1.10.1.tar.xz) = 774144 bytes
-SHA1 (patch-regress_nihtest.conf.in) = 5437e9c11f87cfb8e7c9a391d5a57fd95bd31fca
+SHA1 (patch-regress_nihtest.conf.in) = 4ba110f2acef8ded4956c1931ee6f7c6e0618cd0
--- pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in 2023/08/24 07:12:34 1.2
+++ pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in 2023/08/25 07:12:41 1.3
@@ -1,14 +1,15 @@
-$NetBSD: patch-regress_nihtest.conf.in,v 1.2 2023/08/24 07:12:34 wiz Exp $
+$NetBSD: patch-regress_nihtest.conf.in,v 1.3 2023/08/25 07:12:41 adam Exp $
To allow testing in uninstalled state.
--- regress/nihtest.conf.in.orig 2023-08-23 10:55:23.000000000 +0000
+++ regress/nihtest.conf.in
-@@ -9,6 +9,7 @@ program-directories = @PROJECT_BINARY_DI
+@@ -9,6 +9,8 @@ program-directories = @PROJECT_BINARY_DI
@PROJECT_BINARY_DIR@/src/Debug
default-program = ziptool_regress
default-stderr-replace = "^([A-Z]:)?[^ :]*: " ""
+environment-passthrough = LD_LIBRARY_PATH
++ DYLD_LIBRARY_PATH
[comparators]
zip.zip = zipcmp -pv