Module Name: src
Committed By: tls
Date: Wed Feb 3 06:25:55 UTC 2010
Modified Files:
src/distrib/sets/lists/base: shl.elf shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/external/bsd: Makefile
Added Files:
src/external/bsd/liblzf: Makefile Makefile.inc
src/external/bsd/liblzf/lib: Makefile
Log Message:
Plug liblzf into build. Liblzf is a small (3504 byte shared library on i386),
very very fast, 2-clause BSD-licensed compressor. We provide the LZF_STATE
version of the API, which is not the default for generic liblzf.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.517 -r1.518 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1380 -r1.1381 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/liblzf/Makefile \
src/external/bsd/liblzf/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/liblzf/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.198 src/distrib/sets/lists/base/shl.elf:1.199
--- src/distrib/sets/lists/base/shl.elf:1.198 Sun Jan 31 03:09:26 2010
+++ src/distrib/sets/lists/base/shl.elf Wed Feb 3 06:25:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.198 2010/01/31 03:09:26 pooka Exp $
+# $NetBSD: shl.elf,v 1.199 2010/02/03 06:25:54 tls Exp $
#
# Note: Do not mark "old" major and major.minor shared libraries as
# "obsolete"; just remove the entry, as third-party applications
@@ -28,6 +28,8 @@
./lib/libipsec.so.3 base-net-shlib dynamicroot
./lib/libkvm.so base-sys-shlib dynamicroot
./lib/libkvm.so.6 base-sys-shlib dynamicroot
+./lib/liblzf.so base-sys-shlib dynamicroot
+./lib/liblzf.so.0 base-sys-shlib dynamicroot
./lib/libm.so base-sys-shlib dynamicroot
./lib/libm.so.0 base-sys-shlib dynamicroot
./lib/libprop.so base-sys-shlib dynamicroot
@@ -184,6 +186,8 @@
./usr/lib/libldap_r.so.4 base-ldap-shlib ldap
./usr/lib/liblwres.so base-bind-shlib
./usr/lib/liblwres.so.5 base-bind-shlib
+./usr/lib/liblzf.so base-sys-shlib
+./usr/lib/liblzf.so.0 base-sys-shlib
./usr/lib/libm.so base-sys-shlib
./usr/lib/libm.so.0 base-sys-shlib
./usr/lib/libmagic.so base-sys-shlib
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.517 src/distrib/sets/lists/base/shl.mi:1.518
--- src/distrib/sets/lists/base/shl.mi:1.517 Sun Jan 31 03:09:26 2010
+++ src/distrib/sets/lists/base/shl.mi Wed Feb 3 06:25:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.517 2010/01/31 03:09:26 pooka Exp $
+# $NetBSD: shl.mi,v 1.518 2010/02/03 06:25:54 tls Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -22,6 +22,7 @@
./lib/libgcc_s.so.1.0 base-sys-shlib gcc
./lib/libipsec.so.3.0 base-net-shlib dynamicroot
./lib/libkvm.so.6.0 base-sys-shlib dynamicroot
+./lib/liblzf.so.0.0 base-sys-shlib dynamicroot
./lib/libm.so.0.8 base-sys-shlib dynamicroot
./lib/libprop.so.1.1 base-sys-shlib dynamicroot
./lib/libradius.so.4.0 base-sys-shlib dynamicroot
@@ -98,6 +99,7 @@
./usr/lib/libldap.so.4.0 base-ldap-shlib ldap
./usr/lib/libldap_r.so.4.0 base-ldap-shlib ldap
./usr/lib/liblwres.so.5.1 base-bind-shlib
+./usr/lib/liblzf.so.0.0 base-sys-shlib
./usr/lib/libm.so.0.8 base-sys-shlib
./usr/lib/libmagic.so.3.0 base-sys-shlib
./usr/lib/libmenu.so.6.0 base-sys-shlib
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1380 src/distrib/sets/lists/comp/mi:1.1381
--- src/distrib/sets/lists/comp/mi:1.1380 Sun Jan 31 03:09:26 2010
+++ src/distrib/sets/lists/comp/mi Wed Feb 3 06:25:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1380 2010/01/31 03:09:26 pooka Exp $
+# $NetBSD: mi,v 1.1381 2010/02/03 06:25:55 tls Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1389,6 +1389,8 @@
./usr/include/locale.h comp-c-include
./usr/include/login_cap.h comp-c-include
./usr/include/lwp.h comp-c-include
+./usr/include/lzf.h comp-c-include
+./usr/include/lzfP.h comp-c-include
./usr/include/magic.h comp-c-include
./usr/include/malloc.h comp-c-include
./usr/include/math.h comp-c-include
@@ -2476,6 +2478,9 @@
./usr/lib/liblwres.a comp-bind-lib
./usr/lib/liblwres_g.a -unknown- debuglib
./usr/lib/liblwres_p.a comp-bind-proflib profile
+./usr/lib/liblzf.a comp-c-lib
+./usr/lib/liblzf_g.a -unknown- debuglib
+./usr/lib/liblzf_p.a comp-c-proflib profile
./usr/lib/libm.a comp-c-lib
./usr/lib/libm_g.a -unknown- debuglib
./usr/lib/libm_p.a comp-c-proflib profile
@@ -3674,6 +3679,7 @@
./usr/libdata/lint/llib-lldap.ln comp-ldap-lintlib lint,ldap
./usr/libdata/lint/llib-lldap_r.ln comp-ldap-lintlib lint,ldap
./usr/libdata/lint/llib-llwres.ln comp-bind-lintlib lint
+./usr/libdata/lint/llib-llzf.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lm.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lmagic.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lmenu.ln comp-c-lintlib lint
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.100 src/distrib/sets/lists/comp/shl.mi:1.101
--- src/distrib/sets/lists/comp/shl.mi:1.100 Sun Jan 31 03:09:27 2010
+++ src/distrib/sets/lists/comp/shl.mi Wed Feb 3 06:25:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.100 2010/01/31 03:09:27 pooka Exp $
+# $NetBSD: shl.mi,v 1.101 2010/02/03 06:25:55 tls Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -60,6 +60,7 @@
./usr/lib/libldap_pic.a comp-ldap-piclib ldap
./usr/lib/libldap_r_pic.a comp-ldap-piclib ldap
./usr/lib/liblwres_pic.a comp-bind-piclib
+./usr/lib/liblzf_pic.a comp-c-piclib
./usr/lib/libm_pic.a comp-c-piclib
./usr/lib/libmagic_pic.a comp-c-piclib
./usr/lib/libmenu_pic.a comp-c-piclib
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.20 src/external/bsd/Makefile:1.21
--- src/external/bsd/Makefile:1.20 Sat Nov 21 03:24:30 2009
+++ src/external/bsd/Makefile Wed Feb 3 06:25:55 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/11/21 03:24:30 roy Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/03 06:25:55 tls Exp $
.include <bsd.own.mk>
-SUBDIR+= am-utils bind dhcpcd fetch file flex libarchive libevent \
+SUBDIR+= am-utils bind dhcpcd fetch file flex libarchive libevent liblzf \
mdocml openresolv pkg_install top byacc
.if (${MKATF} != "no")
Added files:
Index: src/external/bsd/liblzf/Makefile
diff -u /dev/null src/external/bsd/liblzf/Makefile:1.1
--- /dev/null Wed Feb 3 06:25:55 2010
+++ src/external/bsd/liblzf/Makefile Wed Feb 3 06:25:55 2010
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2010/02/03 06:25:55 tls Exp $
+
+SUBDIR= lib
+
+.include <bsd.subdir.mk>
Index: src/external/bsd/liblzf/Makefile.inc
diff -u /dev/null src/external/bsd/liblzf/Makefile.inc:1.1
--- /dev/null Wed Feb 3 06:25:55 2010
+++ src/external/bsd/liblzf/Makefile.inc Wed Feb 3 06:25:55 2010
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.inc,v 1.1 2010/02/03 06:25:55 tls Exp $
+.include <bsd.own.mk>
+
+LIBLZFDIR= ${NETBSDSRCDIR}/external/bsd/liblzf
+.PATH: ${LIBLZFDIR}/dist
+CPPFLAGS+= -I ${LIBLZFDIR}/dist
Index: src/external/bsd/liblzf/lib/Makefile
diff -u /dev/null src/external/bsd/liblzf/lib/Makefile:1.1
--- /dev/null Wed Feb 3 06:25:55 2010
+++ src/external/bsd/liblzf/lib/Makefile Wed Feb 3 06:25:55 2010
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2010/02/03 06:25:55 tls Exp $
+
+.include <bsd.init.mk>
+
+SHLIB_MAJOR= 0
+SHLIB_MINOR= 0
+
+USE_SHLIBDIR= yes
+
+LIB= lzf
+SRCS= lzf_c.c lzf_d.c
+INCS= lzf.h lzfP.h
+INCSDIR= /usr/include
+
+.include <bsd.lib.mk>
