From c1c0ad71d4bf0e65f09477a4dfc11d525b06bc11 Mon Sep 17 00:00:00 2001 From: mbalmer Date: Sat, 15 Oct 2011 10:46:24 +0000 Subject: [PATCH] Link the sqlite Lua module to the build and add it to the set lists. --- distrib/sets/lists/base/ad.mips64eb | 4 +++- distrib/sets/lists/base/ad.mips64el | 4 +++- distrib/sets/lists/base/md.amd64 | 3 ++- distrib/sets/lists/base/md.sparc64 | 3 ++- distrib/sets/lists/base/shl.mi | 3 ++- lib/lua/Makefile | 4 ++-- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/distrib/sets/lists/base/ad.mips64eb b/distrib/sets/lists/base/ad.mips64eb index 2cb94b664d52..8e978e6fec81 100644 --- a/distrib/sets/lists/base/ad.mips64eb +++ b/distrib/sets/lists/base/ad.mips64eb @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.72 2011/10/13 22:08:16 joerg Exp $ +# $NetBSD: ad.mips64eb,v 1.73 2011/10/15 10:46:24 mbalmer Exp $ ./libexec/ld.elf_so-64 base-compat-shlib compat,pic ./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -271,6 +271,7 @@ ./usr/lib/64/lua base-compat-shlib compat ./usr/lib/64/lua/5.1 base-compat-shlib compat ./usr/lib/64/lua/5.1/gpio.so base-compat-shlib compat,pic +./usr/lib/64/lua/5.1/sqlite.so base-compat-shlib compat,pic ./usr/lib/64/security base-compat-shlib ./usr/lib/64/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/64/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam @@ -564,6 +565,7 @@ ./usr/lib/o32/lua base-compat-shlib compat ./usr/lib/o32/lua/5.1 base-compat-shlib compat ./usr/lib/o32/lua/5.1/gpio.so base-compat-shlib compat,pic +./usr/lib/o32/lua/5.1/sqlite.so base-compat-shlib compat,pic ./usr/lib/o32/security base-compat-shlib ./usr/lib/o32/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/o32/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam diff --git a/distrib/sets/lists/base/ad.mips64el b/distrib/sets/lists/base/ad.mips64el index 06cf3952a2f4..37f8d563327b 100644 --- a/distrib/sets/lists/base/ad.mips64el +++ b/distrib/sets/lists/base/ad.mips64el @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.71 2011/10/13 22:08:17 joerg Exp $ +# $NetBSD: ad.mips64el,v 1.72 2011/10/15 10:46:24 mbalmer Exp $ ./libexec/ld.elf_so-64 base-compat-shlib compat,pic ./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -271,6 +271,7 @@ ./usr/lib/64/lua base-compat-shlib compat ./usr/lib/64/lua/5.1 base-compat-shlib compat ./usr/lib/64/lua/5.1/gpio.so base-compat-shlib compat,pic +./usr/lib/64/lua/5.1/sqlite.so base-compat-shlib compat,pic ./usr/lib/64/security base-compat-shlib ./usr/lib/64/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/64/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam @@ -564,6 +565,7 @@ ./usr/lib/o32/lua base-compat-shlib compat ./usr/lib/o32/lua/5.1 base-compat-shlib compat ./usr/lib/o32/lua/5.1/gpio.so base-compat-shlib compat,pic +./usr/lib/o32/lua/5.1/sqlite.so base-compat-shlib compat,pic ./usr/lib/o32/security base-compat-shlib ./usr/lib/o32/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/o32/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index 2a11e6c481da..6ef36c65649e 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.144 2011/10/13 22:08:17 joerg Exp $ +# $NetBSD: md.amd64,v 1.145 2011/10/15 10:46:24 mbalmer Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -274,6 +274,7 @@ ./usr/lib/i386/lua base-compat-shlib compat ./usr/lib/i386/lua/5.1 base-compat-shlib compat ./usr/lib/i386/lua/5.1/gpio.so base-compat-shlib compat,pic +./usr/lib/i386/lua/5.1/sqlite.so base-compat-shlib compat,pic ./usr/lib/i386/security base-compat-shlib compat ./usr/lib/i386/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/i386/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 711c4d0f46e1..52f23f2d070a 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.137 2011/10/13 22:08:17 joerg Exp $ +# $NetBSD: md.sparc64,v 1.138 2011/10/15 10:46:25 mbalmer Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root obsolete ./usr/bin/fdformat base-util-bin @@ -272,6 +272,7 @@ ./usr/lib/sparc/lua base-compat-shlib compat ./usr/lib/sparc/lua/5.1 base-compat-shlib compat ./usr/lib/sparc/lua/5.1/gpio.so base-compat-shlib compat,pic +./usr/lib/sparc/lua/5.1/sqlite.so base-compat-shlib compat,pic ./usr/lib/sparc/security base-compat-shlib compat ./usr/lib/sparc/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos ./usr/lib/sparc/security/pam_chroot.so.3 base-compat-shlib compat,pic diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi index df82f0b591fa..d399a02002c6 100644 --- a/distrib/sets/lists/base/shl.mi +++ b/distrib/sets/lists/base/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.606 2011/10/15 01:32:12 christos Exp $ +# $NetBSD: shl.mi,v 1.607 2011/10/15 10:46:25 mbalmer Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -702,6 +702,7 @@ ./usr/lib/libzpool.so.0.0 base-zfs-shlib zfs,dynamicroot ./usr/lib/libzpool_pic.a base-zfs-shlib zfs,dynamicroot ./usr/lib/lua/5.1/gpio.so base-sys-shlib +./usr/lib/lua/5.1/sqlite.so base-sys-shlib ./usr/lib/nss_mdns.so.0 base-obsolete obsolete ./usr/lib/nss_mdnsd.so.0 base-mdns-shlib mdns ./usr/lib/nss_multicast_dns.so.0 base-mdns-shlib mdns diff --git a/lib/lua/Makefile b/lib/lua/Makefile index aef3643c4a87..f82345c7138c 100644 --- a/lib/lua/Makefile +++ b/lib/lua/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2011/10/10 20:43:00 christos Exp $ +# $NetBSD: Makefile,v 1.4 2011/10/15 10:46:24 mbalmer Exp $ .include .if ${MACHINE_ARCH} != "m68000" # No support for shared libraries and pic code. -SUBDIR+= gpio +SUBDIR+= gpio sqlite .endif .include