CVS commit: pkgsrc/archivers/zziplib

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sat Feb 25 12:16:44 UTC 2017

Modified Files:
        pkgsrc/archivers/zziplib: distinfo
Added Files:
        pkgsrc/archivers/zziplib/patches: patch-zzip_zip.c

Log Message:
Fix archivers/zziplib build on NetBSD 7.99.62 amd64

Fix inline function error reference:
work/zziplib-0.13.59/zzip/.libs/libzzip.so: undefined reference to `__zzip_aligned4'

Replace _zzip_inline with regular static inline.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/archivers/zziplib/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/zziplib/patches/patch-zzip_zip.c

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

Modified files:

Index: pkgsrc/archivers/zziplib/distinfo
diff -u pkgsrc/archivers/zziplib/distinfo:1.12 pkgsrc/archivers/zziplib/distinfo:1.13
--- pkgsrc/archivers/zziplib/distinfo:1.12      Tue Dec  8 11:13:04 2015
+++ pkgsrc/archivers/zziplib/distinfo   Sat Feb 25 12:16:44 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2015/12/08 11:13:04 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2017/02/25 12:16:44 kamil Exp $
 
 SHA1 (zziplib-0.13.59.tar.bz2) = ddbce25cb36c3b4c2b892e2c8a88fa4a0be29a71
 RMD160 (zziplib-0.13.59.tar.bz2) = b96f547039ac005f6e9ca2cf92c388a077b9b21e
@@ -8,3 +8,4 @@ SHA1 (patch-aa) = e5687abbc3bbffa2b461f6
 SHA1 (patch-ba) = 1f680820112114534318ad46603992b16e183866
 SHA1 (patch-bb) = afdcf01c5aea03f7bfd61492acbe4f3743d50b0a
 SHA1 (patch-bc) = 897a79994d90124972afdb9fa803e82520e6ae0e
+SHA1 (patch-zzip_zip.c) = bbceb2ed9cd80620a297d4b8c48624bb2824dafb

Added files:

Index: pkgsrc/archivers/zziplib/patches/patch-zzip_zip.c
diff -u /dev/null pkgsrc/archivers/zziplib/patches/patch-zzip_zip.c:1.1
--- /dev/null   Sat Feb 25 12:16:44 2017
+++ pkgsrc/archivers/zziplib/patches/patch-zzip_zip.c   Sat Feb 25 12:16:44 2017
@@ -0,0 +1,27 @@
+$NetBSD: patch-zzip_zip.c,v 1.1 2017/02/25 12:16:44 kamil Exp $
+
+Fix inline function error reference:
+work/zziplib-0.13.59/zzip/.libs/libzzip.so: undefined reference to `__zzip_aligned4'
+
+Replace _zzip_inline with regular static inline.
+
+--- zzip/zip.c.orig    2009-09-24 21:57:00.000000000 +0000
++++ zzip/zip.c
+@@ -90,7 +90,7 @@ int __zzip_parse_root_directory(int fd,
+                                 struct zzip_dir_hdr **hdr_return,
+                                 zzip_plugin_io_t io);
+ 
+-_zzip_inline char *__zzip_aligned4(char *p);
++static inline char *__zzip_aligned4(char *p);
+ 
+ /* ------------------------  harden routines ------------------------------ */
+ 
+@@ -377,7 +377,7 @@ __zzip_fetch_disk_trailer(int fd, zzip_o
+  * to pointer types but we do need only the lower bits in this implementation,
+  * so we can just cast the value to a long value.
+  */
+-_zzip_inline char *
++static inline char *
+ __zzip_aligned4(char *p)
+ {
+ #define aligned4   __zzip_aligned4