pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/libzip Add a workaround so libzip 1.4.0 buil...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c0173d6bf9b2
branches:  trunk
changeset: 375120:c0173d6bf9b2
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Feb 03 12:04:03 2018 +0000

description:
Add a workaround so libzip 1.4.0 builds successfully on Darwin/Mac OS X

Skip running the regression tests since for some reason the setting
of LD_LIBRARY_PATH isn't passed down through cmake invocation; this
avoids error:

dyld: Library not loaded: @rpath/libzip.5.dylib
  Referenced from: ${WRKSRC}/regress/../src/ziptool
  Reason: image not found

diffstat:

 archivers/libzip/Makefile |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r 7392bc164189 -r c0173d6bf9b2 archivers/libzip/Makefile
--- a/archivers/libzip/Makefile Sat Feb 03 11:32:33 2018 +0000
+++ b/archivers/libzip/Makefile Sat Feb 03 12:04:03 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/12/30 00:19:56 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2018/02/03 12:04:03 jdolecek Exp $
 
 DISTNAME=              libzip-1.4.0
 CATEGORIES=            archivers devel
@@ -17,6 +17,16 @@
 # for tests
 MAKE_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/lib
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+# avoid running regression tests with not yet installed libs,
+# the above LD_LIBRARY_PATH is not passed to commands executed
+# via cmake and zip lib is not found when invoking ziptool
+BUILD_TARGET=   zip
+INSTALL_TARGET= install/fast
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index