Module Name: src
Committed By: agc
Date: Tue Mar 26 01:59:13 UTC 2013
Modified Files:
src/external/cddl/osnet/lib/libzpool [agc-symver]: Makefile
src/external/cddl/osnet/sbin/zpool [agc-symver]: Makefile
Added Files:
src/lib/libz [agc-symver]: Version.map
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.18.1 src/external/cddl/osnet/lib/libzpool/Makefile
cvs rdiff -u -r1.4 -r1.4.18.1 src/external/cddl/osnet/sbin/zpool/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/lib/libz/Version.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.6 src/external/cddl/osnet/lib/libzpool/Makefile:1.6.18.1
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.6 Tue Dec 14 23:39:11 2010
+++ src/external/cddl/osnet/lib/libzpool/Makefile Tue Mar 26 01:59:13 2013
@@ -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
Index: src/external/cddl/osnet/sbin/zpool/Makefile
diff -u src/external/cddl/osnet/sbin/zpool/Makefile:1.4 src/external/cddl/osnet/sbin/zpool/Makefile:1.4.18.1
--- src/external/cddl/osnet/sbin/zpool/Makefile:1.4 Tue Dec 14 01:03:10 2010
+++ src/external/cddl/osnet/sbin/zpool/Makefile Tue Mar 26 01:59:13 2013
@@ -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+= -L${LIBZPOOL_OBJDIR} -lz
LDADD+= -lm -lutil -lpthread
+PROGDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+
.PATH: ${ZFSDIR}/dist/cmd/zpool
.include <bsd.prog.mk>
Added files:
Index: src/lib/libz/Version.map
diff -u /dev/null src/lib/libz/Version.map:1.1.2.1
--- /dev/null Tue Mar 26 01:59:13 2013
+++ src/lib/libz/Version.map Tue Mar 26 01:59:13 2013
@@ -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:
+ *;
+};
+
