pkgsrc-Changes archive

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

CVS commit: pkgsrc/archivers/libzip



Module Name:    pkgsrc
Committed By:   jdolecek
Date:           Sat Feb  3 12:04:03 UTC 2018

Modified Files:
        pkgsrc/archivers/libzip: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/archivers/libzip/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libzip/Makefile
diff -u pkgsrc/archivers/libzip/Makefile:1.32 pkgsrc/archivers/libzip/Makefile:1.33
--- pkgsrc/archivers/libzip/Makefile:1.32       Sat Dec 30 00:19:56 2017
+++ pkgsrc/archivers/libzip/Makefile    Sat Feb  3 12:04:03 2018
@@ -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 @@ TEST_TARGET=         test
 # 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