[src/agc-symver]: src First pass at adding symbol versioning for libz.

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b9ea8d61a2c9
branches:  agc-symver
changeset: 785630:b9ea8d61a2c9
user:      agc <agc%NetBSD.org@localhost>
date:      Tue Mar 26 01:59:13 2013 +0000

description:
First pass at adding symbol versioning for libz.

Also fix up the ZFS infrastructure where it tried to link with the
wrong libz.so instance -- these problems showed up in testing with the
versioned libz.so.

diffstat:

 external/cddl/osnet/lib/libzpool/Makefile |   9 ++-
 external/cddl/osnet/sbin/zpool/Makefile   |   6 +-
 lib/libz/Version.map                      |  85 +++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+), 4 deletions(-)

diffs (132 lines):

diff -r 15c0aeeb5f40 -r b9ea8d61a2c9 external/cddl/osnet/lib/libzpool/Makefile
--- a/external/cddl/osnet/lib/libzpool/Makefile Tue Mar 26 01:54:23 2013 +0000
+++ b/external/cddl/osnet/lib/libzpool/Makefile Tue Mar 26 01:59:13 2013 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.6 2010/12/14 23:39:11 haad Exp $
+#      $NetBSD: Makefile,v 1.6.18.1 2013/03/26 01:59:13 agc Exp $
+
+.include <bsd.own.mk>
 
 .include "${.CURDIR}/../../dist/uts/common/Makefile.files"
 .include "../../Makefile.zfs"
@@ -10,8 +12,9 @@
 .PATH: ${.CURDIR}/../../dist/uts/common/os
 
 LIB=           zpool
-DPADD=         ${LIBPTHREAD} ${LIBZ}
-LDADD=         -lpthread -lz
+DPADD=         ${LIBPTHREAD}
+LDADD=         -lpthread
+LIBDPLIBS+=    z               ${NETBSDSRCDIR}/lib/libz
 CPPFLAGS+=     -std=c99
 #CPPFLAGS+=-Wall -Wno-unknown-pragmas
 
diff -r 15c0aeeb5f40 -r b9ea8d61a2c9 external/cddl/osnet/sbin/zpool/Makefile
--- a/external/cddl/osnet/sbin/zpool/Makefile   Tue Mar 26 01:54:23 2013 +0000
+++ b/external/cddl/osnet/sbin/zpool/Makefile   Tue Mar 26 01:59:13 2013 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.4 2010/12/14 01:03:10 haad Exp $
+#      $NetBSD: Makefile,v 1.4.18.1 2013/03/26 01:59:13 agc Exp $
+
+.include <bsd.own.mk>
 
 .include "../../Makefile.zfs"
 
@@ -31,6 +33,8 @@
 
 LDADD+= -lm -lutil -lpthread
 
+PROGDPLIBS+=     z               ${NETBSDSRCDIR}/lib/libz
+
 .PATH: ${ZFSDIR}/dist/cmd/zpool
 
 .include <bsd.prog.mk>
diff -r 15c0aeeb5f40 -r b9ea8d61a2c9 lib/libz/Version.map
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libz/Version.map      Tue Mar 26 01:59:13 2013 +0000
@@ -0,0 +1,85 @@
+LIBZ_1.0.0.0 {
+global:
+       uncompress;
+       inflateBack;
+       inflateBackEnd;
+       inflateBackInit_;
+       gzclearerr;
+       gzclose;
+       gzdirect;
+       gzdopen;
+       gzeof;
+       gzerror;
+       gzflush;
+       gzgetc;
+       gzgets;
+       gzopen;
+       gzprintf;
+       gzputc;
+       gzputs;
+       gzread;
+       gzrewind;
+       gzseek;
+       gzsetparams;
+       gztell;
+       gzungetc;
+       gzwrite;
+       inflate;
+       inflateCopy;
+       inflateEnd;
+       inflateGetHeader;
+       inflateInit2_;
+       inflateInit_;
+       inflatePrime;
+       inflateReset;
+       inflateSetDictionary;
+       inflateSync;
+       inflateSyncPoint;
+       inflate_fast;
+       inflate_table;
+       deflate;
+       deflateBound;
+       deflateCopy;
+       deflateEnd;
+       deflateInit2_;
+       deflateInit_;
+       deflateParams;
+       deflatePrime;
+       deflateReset;
+       deflateSetDictionary;
+       deflateSetHeader;
+       deflateTune;
+       zError;
+       zcalloc;
+       zcfree;
+       zlibCompileFlags;
+       zlibVersion;
+       tr_align;
+       tr_flush_block;
+       tr_init;
+       tr_stored_block;
+       tr_tally;
+       crc32;
+       crc32_combine;
+       get_crc_table;
+       compress;
+       compress2;
+       compressBound;
+       adler32;
+       adler32_combine;
+};
+
+NetBSD_6.99.18.0 {
+} LIBZ_1.0.0.0;
+
+LIBZ_private_1.0.0.0 {
+global:
+       _tr_align;
+       _tr_flush_block;
+       _tr_init;
+       _tr_stored_block;
+       _tr_tally;
+local:
+       *;
+};
+