summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--exception_lists/packaging10
-rw-r--r--usr/src/cmd/idmap/idmapd/Makefile10
-rw-r--r--usr/src/cmd/idmap/idmapd/idmapd.h2
-rw-r--r--usr/src/cmd/sqlite/Makefile9
-rw-r--r--usr/src/cmd/svc/configd/Makefile18
-rw-r--r--usr/src/lib/libsqlite/Makefile11
-rw-r--r--usr/src/lib/libsqlite/Makefile.com121
-rw-r--r--usr/src/lib/libsqlite/i386/Makefile6
-rw-r--r--usr/src/lib/libsqlite/llib-lsqlite-sys (renamed from usr/src/lib/libsqlite/llib-lsqlite)2
-rw-r--r--usr/src/lib/libsqlite/mapfile-sqlite10
-rw-r--r--usr/src/lib/libsqlite/sparc/Makefile6
-rw-r--r--usr/src/lib/smbsrv/libsmb/common/libsmb.h10
-rw-r--r--usr/src/lib/smbsrv/libsmb/common/smb_nic.c1
-rw-r--r--usr/src/lib/smbsrv/libsmb/common/smb_sqlite.h4
-rw-r--r--usr/src/lib/smbsrv/libsmb/i386/Makefile4
-rw-r--r--usr/src/lib/smbsrv/libsmb/sparc/Makefile4
-rw-r--r--usr/src/pkg/manifests/service-file-system-smb.mf1
-rw-r--r--usr/src/pkg/manifests/system-library.mf1
18 files changed, 104 insertions, 126 deletions
diff --git a/exception_lists/packaging b/exception_lists/packaging
index 1c2125ac0e..2f866e63fd 100644
--- a/exception_lists/packaging
+++ b/exception_lists/packaging
@@ -703,11 +703,11 @@ usr/include/sys/u8_textprep_data.h
#
# SQLite is private, used by SMF (svc.configd), idmapd and libsmb.
#
-usr/include/sqlite
-usr/lib/libsqlite-native.o
-usr/lib/libsqlite.o
-usr/lib/llib-lsqlite.ln
-usr/lib/smbsrv/libsqlite.so
+usr/include/sqlite-sys
+lib/libsqlite-native.o
+lib/libsqlite-sys.so
+lib/llib-lsqlite-sys
+lib/llib-lsqlite-sys.ln
#
# Private/Internal kiconv header files. Do not ship.
#
diff --git a/usr/src/cmd/idmap/idmapd/Makefile b/usr/src/cmd/idmap/idmapd/Makefile
index f1aef3d137..b99b8677be 100644
--- a/usr/src/cmd/idmap/idmapd/Makefile
+++ b/usr/src/cmd/idmap/idmapd/Makefile
@@ -50,9 +50,6 @@ install := TARGET = install
clean := TARGET = clean
clobber := TARGET = clobber
-LIBSQLITE = $(ROOT)/usr/lib/libsqlite.o
-SQLITELINT = $(ROOT)/usr/lib/llib-lsqlite.ln
-
include ../../Makefile.cmd
CERRWARN += -_gcc=-Wno-type-limits
@@ -82,7 +79,9 @@ $(OBJS) := CPPFLAGS += $(INCS) -D_REENTRANT
$(POFILE) := CPPFLAGS += $(INCS)
CFLAGS += $(CCVERBOSE)
-LDLIBS += -lsecdb \
+LDLIBS += \
+ -lsqlite-sys \
+ -lsecdb \
-lsocket \
-lnsl \
-lidmap \
@@ -107,7 +106,6 @@ DIRMODE = 0755
FILEMODE = 0555
lint_SRCS := CPPFLAGS += $(INCS) -D_REENTRANT $(RPC_MSGOUT_OPT)
-lint := LDLIBS += $(SQLITELINT)
.KEEP_STATE:
@@ -116,7 +114,7 @@ lint := LDLIBS += $(SQLITELINT)
all: $(PROG)
$(PROG): $(OBJS) $$(MAPFILES)
- $(LINK.c) -o $@ $(OBJS) $(LIBSQLITE) $(LDLIBS)
+ $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
$(POST_PROCESS)
$(POFILE): $(POFILES)
diff --git a/usr/src/cmd/idmap/idmapd/idmapd.h b/usr/src/cmd/idmap/idmapd/idmapd.h
index a527f9265a..7ed2740a34 100644
--- a/usr/src/cmd/idmap/idmapd/idmapd.h
+++ b/usr/src/cmd/idmap/idmapd/idmapd.h
@@ -34,7 +34,7 @@
#include <thread.h>
#include <libintl.h>
#include <strings.h>
-#include <sqlite/sqlite.h>
+#include <sqlite-sys/sqlite.h>
#include <syslog.h>
#include <inttypes.h>
#include <rpcsvc/idmap_prot.h>
diff --git a/usr/src/cmd/sqlite/Makefile b/usr/src/cmd/sqlite/Makefile
index 86a329605b..795e391c96 100644
--- a/usr/src/cmd/sqlite/Makefile
+++ b/usr/src/cmd/sqlite/Makefile
@@ -29,8 +29,7 @@ include ../Makefile.cmd
include $(SRC)/lib/Makefile.lib
-SQLITEHDRDIR= $(ROOTHDRDIR)/sqlite
-LIBSQLITE= $(ROOTLIBDIR)/libsqlite.o
+SQLITEHDRDIR= $(ROOTHDRDIR)/sqlite-sys
ROOTLIBSVCBIN= $(ROOT)/lib/svc/bin
ROOTSQLITE= $(PROG:%=$(ROOTLIBSVCBIN)/%)
@@ -41,6 +40,8 @@ $(OBJS) := CTFCONVERT_POST = $(CTFCONVERT_O)
CERRWARN += -_gcc=-Wno-empty-body
+LDLIBS += -lsqlite-sys
+
.KEEP_STATE:
$(ROOTSQLITE) := FILEMODE= 555
@@ -53,8 +54,8 @@ CPPFLAGS += -D_REENTRANT -DTHREADSAFE=1 -DHAVE_USLEEP=1 \
$(PROG): $(OBJS) $(SQLITEHDRDIR)/sqlite.h
$(LINK.c) -o $@ $(OBJS) \
- $(MAPFILE.NES:%=-M%) $(MAPFILE.NED:%=-M%) $(LIBSQLITE)
- $(CTFMERGE) -t -L VERSION -o $@ $(OBJS) $(LIBSQLITE)
+ $(MAPFILE.NES:%=-M%) $(MAPFILE.NED:%=-M%) $(LDLIBS)
+ $(CTFMERGE) -t -L VERSION -o $@ $(OBJS)
$(POST_PROCESS)
all: $(PROG)
diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile
index c6f2000e8c..07866fd0f0 100644
--- a/usr/src/cmd/svc/configd/Makefile
+++ b/usr/src/cmd/svc/configd/Makefile
@@ -48,7 +48,8 @@ $(NATIVE_BUILD)OBJS = $(MYOBJS:%.o=%-native.o)
ROOTCMDDIR= $(ROOT)/lib/svc/bin
-MYCPPFLAGS = -I. -I../common -I../../../common/svc -I$(ROOT)/usr/include/sqlite -D_REENTRANT
+MYCPPFLAGS = -I. -I../common -I../../../common/svc \
+ -I$(ROOT)/usr/include/sqlite-sys -D_REENTRANT
CPPFLAGS += $(MYCPPFLAGS)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
@@ -69,6 +70,9 @@ LIBSCF = $(SRC)/lib/libscf
SCRIPTFILE = restore_repository
ROOTSCRIPTFILE = $(ROOTCMDDIR)/$(SCRIPTFILE)
+#
+# Native variant (used in ../seed)
+#
$(NATIVE_BUILD)CC = $(NATIVECC)
$(NATIVE_BUILD)LD = $(NATIVELD)
$(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
@@ -81,17 +85,17 @@ $(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
DIRMODE = 0755
FILEMODE = 0555
-LIBSQLITE = $(ROOT)/usr/lib/libsqlite.o
-$(NATIVE_BUILD)LIBSQLITE = $(ROOT)/usr/lib/libsqlite-native.o
-SQLITELINT = $(ROOT)/usr/lib/llib-lsqlite.ln
+OBJSQLITE =
+LIBSQLITE = -lsqlite-sys
+$(NATIVE_BUILD)OBJSQLITE = $(ROOT)/lib/libsqlite-native.o
+$(NATIVE_BUILD)LIBSQLITE =
-OBJS += $(LIBSQLITE)
+OBJS += $(OBJSQLITE)
+LDLIBS += $(LIBSQLITE)
install := TARGET = install
clobber := TARGET = clobber
-lint := LDLIBS += $(SQLITELINT)
-
.KEEP_STATE:
.PARALLEL: $(MYOBJS) $(MYOBJS:%.o=%-native.o)
diff --git a/usr/src/lib/libsqlite/Makefile b/usr/src/lib/libsqlite/Makefile
index 241e3904bd..2d156094a3 100644
--- a/usr/src/lib/libsqlite/Makefile
+++ b/usr/src/lib/libsqlite/Makefile
@@ -2,8 +2,6 @@
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
SUBDIRS = $(MACH)
@@ -18,10 +16,10 @@ ENCODING = ISO8859
SRCDIR= src
HDRS= sqlite.h sqlite-misc.h
-ROOTHDRDIR= $(ROOT)/usr/include/sqlite
+ROOTHDRDIR= $(ROOT)/usr/include/sqlite-sys
ROOTHDRS= $(HDRS:%=$(ROOTHDRDIR)/%)
CHECKHDRS= $(HDRS:%.h=%.check)
-CLEANFILES += sqlite.h
+CLOBBERFILES += sqlite.h
.KEEP_STATE:
@@ -35,7 +33,8 @@ lint := TARGET= lint
# This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments.
#
-all clobber install lint: $(SUBDIRS)
+all install: sqlite.h $(SUBDIRS)
+clobber lint: $(SUBDIRS)
$(ROOTHDRDIR):
$(INS.dir)
@@ -52,7 +51,7 @@ check:
#
sqlite.h: $(SRCDIR)/sqlite.h.in
@echo "Generating $@"; \
- sed -e 's"--VERS--"$(SQLITE_VERSION)-$(VERSION)"' \
+ sed -e 's"--VERS--"$(SQLITE_VERSION)"' \
-e s/--ENCODING--/$(ENCODING)/ \
$(SRCDIR)/sqlite.h.in > $@
diff --git a/usr/src/lib/libsqlite/Makefile.com b/usr/src/lib/libsqlite/Makefile.com
index ecafa30d6c..e45f1767dc 100644
--- a/usr/src/lib/libsqlite/Makefile.com
+++ b/usr/src/lib/libsqlite/Makefile.com
@@ -3,12 +3,11 @@
# Use is subject to license terms.
#
-SQLITE_VERSION = 2.8.15-repcached
+# Make the SO name unlikely to conflict with any other
+# libsqlite that might also be found on the system.
+LIBRARY = libsqlite-sys.a
-LIBRARY = libsqlite.a
-RELOC = $(LIBRARY:%.a=%.o)
-
-VERS = .1
+VERS = .2.8.15
OBJECTS = \
attach.o \
auth.o \
@@ -44,18 +43,22 @@ OBJECTS = \
include $(SRC)/lib/Makefile.lib
-# The shared object install target directory is usr/lib/smbsrv.
-SMBSRVLIBDIR= $(ROOTLIBDIR)/smbsrv
-SMBSRVLINK= $(SMBSRVLIBDIR)/$(LIBLINKS)
+# install this library in the root filesystem
+include $(SRC)/lib/Makefile.rootfs
SRCDIR = ../src
TOOLDIR = ../tool
$(DYNLIB) := LDLIBS += -lc
-LIBS = $(RELOC) $(LINTLIB) $(DYNLIB)
+LIBS = $(DYNLIB) $(LINTLIB) $(NATIVERELOC)
+
+$(LINTLIB) := SRCS = ../$(LINTSRC)
-$(LINTLIB) := SRCS = $(LINTSRC)
+# generated sources
+GENSRC = opcodes.c parse.c
+# all sources
SRCS = \
+ $(GENSRC) \
$(SRCDIR)/attach.c \
$(SRCDIR)/auth.c \
$(SRCDIR)/btree.c \
@@ -70,10 +73,8 @@ SRCS = \
$(SRCDIR)/hash.c \
$(SRCDIR)/insert.c \
$(SRCDIR)/main.c \
- opcodes.c \
$(SRCDIR)/os.c \
$(SRCDIR)/pager.c \
- parse.c \
$(SRCDIR)/pragma.c \
$(SRCDIR)/printf.c \
$(SRCDIR)/random.c \
@@ -98,15 +99,17 @@ CERRWARN += -_gcc=-Wno-unused-label
MAPFILES = ../mapfile-sqlite
+# headers generated here
+GENHDR = opcodes.h parse.h
+
# Header files used by all library source files.
#
HDR = \
+ $(GENHDR) \
$(SRCDIR)/btree.h \
$(SRCDIR)/config.h \
$(SRCDIR)/hash.h \
- opcodes.h \
$(SRCDIR)/os.h \
- parse.h \
../sqlite.h \
$(SRCDIR)/sqliteInt.h \
$(SRCDIR)/vdbe.h \
@@ -131,11 +134,11 @@ TESTOBJS = $(TESTSRC:$(SRCDIR)/%.c=%.o)
TESTCLEAN = $(TESTOBJS) test.db test.tcl test1.bt test2.db testdb
#
-# Native variants
+# Native variant (needed by cmd/configd)
#
-NATIVERELOC = $(RELOC:%.o=%-native.o)
-NATIVEPROGS = lemon-build testfixture
-NATIVEOBJS = lemon.o $(OBJS:%.o=%-native.o)
+NATIVERELOC = libsqlite-native.o
+NATIVEPROGS = testfixture
+NATIVEOBJS = $(OBJS:%.o=%-native.o)
NATIVETARGETS = $(NATIVEPROGS) $(NATIVEOBJS) $(NATIVERELOC)
@@ -163,8 +166,6 @@ testfixture := CFLAGS += \
testfixture := LDLIBS += -R$(TCLBASE)/lib -L$(TCLBASE)/lib -l$(TCLVERS) -lm -ldl
CLEANFILES += \
- $(RELOC) \
- $(LINTLIB) \
$(NATIVETARGETS) \
$(TESTCLEAN) \
lemon \
@@ -177,12 +178,10 @@ CLEANFILES += \
parse_tmp.out \
parse_tmp.y \
parse.c \
- parse.h
+ parse.h
ENCODING = ISO8859
-LINTSRC= ../llib-lsqlite
-
.PARALLEL: $(OBJS) $(OBJS:%.o=%-native.o)
.KEEP_STATE:
@@ -191,36 +190,28 @@ LINTSRC= ../llib-lsqlite
# are what get build when you type just "make" with no arguments.
#
all: $(LIBS)
-install: all $(ROOTLIBDIR)/$(RELOC) $(ROOTLIBDIR)/$(NATIVERELOC) \
- $(ROOTLIBDIR)/llib-lsqlite.ln $(SMBSRVLIBDIR)/$(DYNLIB)
+install: all \
+ $(ROOTLIBDIR)/$(DYNLIB) \
+ $(ROOTLIBDIR)/$(LINTLIB) \
+ $(ROOTLIBDIR)/$(NATIVERELOC)
-$(ROOTLIBDIR)/$(RELOC) := FILEMODE= 644
-$(ROOTLIBDIR)/$(NATIVERELOC) := FILEMODE= 644
-$(ROOTLIBDIR)/llib-lsqlite.ln := FILEMODE= 644
-$(SMBSRVLIBDIR)/$(DYNLIB) := FILEMODE= 755
+lint:
-$(ROOTLIBDIR)/%: %
- $(INS.file)
+all_h: $(GENHDR)
-$(SMBSRVLIBDIR): $(ROOTLIBDIR)
- $(INS.dir)
-
-$(SMBSRVLIBDIR)/%: % $(SMBSRVLIBDIR)
- $(INS.file)
+$(ROOTLIBDIR)/$(NATIVERELOC) := FILEMODE= 644
+$(ROOTLINTDIR)/$(LINTLIB) := FILEMODE= 644
-$(SMBSRVLINK): $(SMBSRVLIBDIR) $(SMBSRVLIBDIR)/$(DYNLIB)
+$(ROOTLINK): $(ROOTLIBDIR) $(ROOTLIBDIR)/$(DYNLIB)
$(INS.liblink)
-$(OBJS) $(OBJS:%.o=%-native.o): $(HDR)
+$(ROOTLINTDIR)/%: ../%
+ $(INS.file)
native: $(NATIVERELOC)
-$(RELOC): objs .WAIT $(OBJS)
- $(LD) -r $(MAPFILES:%=-M%) -o $(RELOC) $(OBJS)
- $(CTFMERGE) -t -f -L VERSION -o $(RELOC) $(OBJS)
-
$(NATIVERELOC): objs .WAIT $(OBJS:%.o=%-native.o)
- $(LD) -r $(MAPFILES:%=-M%) -o $(NATIVERELOC) $(OBJS:%.o=%-native.o)
+ $(LD) -r -o $(NATIVERELOC) $(OBJS:%.o=%-native.o)
opcodes.h: $(SRCDIR)/vdbe.c
@echo "Generating $@"; \
@@ -239,20 +230,6 @@ opcodes.c: $(SRCDIR)/vdbe.c
sed -e 's/^.*OP_/ "/' -e 's/:.*$$/", /' >> $@ ; \
echo '};' >> $@
-#
-# We use a recursive invocation because otherwise pmake always rebuilds
-# everything, due to multiple expansions of "foo := A += B".
-#
-lemon: FRC
- $(MAKE) lemon-build
-
-lemon-build: lemon.o $(TOOLDIR)/lempar.c
- $(LINK.c) -o lemon lemon.o
- $(RM) lempar.c
- $(LN) -s $(TOOLDIR)/lempar.c lempar.c
- $(RM) lemon-build
- $(CP) lemon lemon-build
-
testfixture: FRC
@if [ -f $(TCLBASE)/include/tcl.h ]; then \
unset SUNPRO_DEPENDENCIES; \
@@ -263,39 +240,43 @@ testfixture: FRC
exit 1; \
fi
-parse_tmp.out: $(SRCDIR)/parse.y lemon
- $(RM) parse_tmp.y
+parse.h parse.c : $(SRCDIR)/parse.y $(TOOLDIR)/lemon.c $(TOOLDIR)/lempar.c
+ -$(RM) parse_tmp.y lempar.c
$(CP) $(SRCDIR)/parse.y parse_tmp.y
+ $(CP) $(TOOLDIR)/lempar.c lempar.c
+ $(NATIVECC) -o lemon $(TOOLDIR)/lemon.c
./lemon parse_tmp.y
-
-parse.h: parse_tmp.out
+ -$(RM) parse.c parse.h
$(CP) parse_tmp.h parse.h
-
-parse.c: parse_tmp.out
$(CP) parse_tmp.c parse.c
-objs/%-native.o: $(SRCDIR)/%.c
+objs/%-native.o: $(SRCDIR)/%.c $(GENHDR)
$(COMPILE.c) -o $@ $<
$(POST_PROCESS_O)
-objs/%-native.o: %.c
+objs/%-native.o: %.c $(GENHDR)
$(COMPILE.c) -o $@ $<
$(POST_PROCESS_O)
-objs/parse-native.o: parse.c
+objs/parse-native.o: parse.c $(GENHDR)
$(COMPILE.c) -o $@ parse.c
$(POST_PROCESS_O)
-objs/%.o: %.c
+objs/%.o pics/%.o: $(SRCDIR)/%.c $(GENHDR)
$(COMPILE.c) -o $@ $<
$(POST_PROCESS_O)
-%.o: $(SRCDIR)/%.c
+objs/%.o pics/%.o: %.c $(GENHDR)
$(COMPILE.c) -o $@ $<
$(POST_PROCESS_O)
-%.o: $(TOOLDIR)/%.c
- $(COMPILE.c) -o $@ $<
+# need direct rules for generated files
+objs/opcodes.o pics/opcodes.o: opcodes.c $(GENHDR)
+ $(COMPILE.c) -o $@ opcodes.c
+ $(POST_PROCESS_O)
+
+objs/parse.o pics/parse.o: parse.c $(GENHDR)
+ $(COMPILE.c) -o $@ parse.c
$(POST_PROCESS_O)
include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/libsqlite/i386/Makefile b/usr/src/lib/libsqlite/i386/Makefile
index a60da1b947..c7cca61bea 100644
--- a/usr/src/lib/libsqlite/i386/Makefile
+++ b/usr/src/lib/libsqlite/i386/Makefile
@@ -22,11 +22,7 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.com
-install: $(ROOTLIBDIR)/$(RELOC) $(SMBSRVLIBDIR)/$(DYNLIB) $(SMBSRVLINK)
-
-$(ROOTLIBDIR)/$(RELOC): all
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libsqlite/llib-lsqlite b/usr/src/lib/libsqlite/llib-lsqlite-sys
index 220ae71518..c4d2f47fd9 100644
--- a/usr/src/lib/libsqlite/llib-lsqlite
+++ b/usr/src/lib/libsqlite/llib-lsqlite-sys
@@ -3,8 +3,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/* LINTLIBRARY */
/* PROTOLIB1 */
diff --git a/usr/src/lib/libsqlite/mapfile-sqlite b/usr/src/lib/libsqlite/mapfile-sqlite
index 7dbdf5d2be..f93dc474b4 100644
--- a/usr/src/lib/libsqlite/mapfile-sqlite
+++ b/usr/src/lib/libsqlite/mapfile-sqlite
@@ -22,7 +22,7 @@
$mapfile_version 2
-SYMBOL_SCOPE {
+SYMBOL_VERSION ILLUMOS_sqlite_2.8.15 {
global:
# exported functions
sqlite_open;
@@ -72,7 +72,15 @@ SYMBOL_SCOPE {
# exported data
sqlite_version;
sqlite_encoding;
+};
+SYMBOL_VERSION SUNWprivate {
+ global:
+ sqlite_temp_directory;
+ sqliteIsNumber;
+ sqliteOsFileExists;
+ sqliteStrICmp;
+ sqliteStrNICmp;
local:
*;
};
diff --git a/usr/src/lib/libsqlite/sparc/Makefile b/usr/src/lib/libsqlite/sparc/Makefile
index a60da1b947..c7cca61bea 100644
--- a/usr/src/lib/libsqlite/sparc/Makefile
+++ b/usr/src/lib/libsqlite/sparc/Makefile
@@ -22,11 +22,7 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.com
-install: $(ROOTLIBDIR)/$(RELOC) $(SMBSRVLIBDIR)/$(DYNLIB) $(SMBSRVLINK)
-
-$(ROOTLIBDIR)/$(RELOC): all
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/smbsrv/libsmb/common/libsmb.h b/usr/src/lib/smbsrv/libsmb/common/libsmb.h
index 31a5aeee2f..24777e3a74 100644
--- a/usr/src/lib/smbsrv/libsmb/common/libsmb.h
+++ b/usr/src/lib/smbsrv/libsmb/common/libsmb.h
@@ -42,7 +42,6 @@ extern "C" {
#include <stdlib.h>
#include <libscf.h>
#include <libshare.h>
-#include <sqlite/sqlite.h>
#include <uuid/uuid.h>
#include <synch.h>
@@ -679,10 +678,13 @@ typedef struct smb_gsid {
uint16_t gs_type;
} smb_gsid_t;
+struct sqlite_vm;
+struct sqlite;
+
typedef struct smb_giter {
- sqlite_vm *sgi_vm;
- sqlite *sgi_db;
- uint32_t sgi_nerr;
+ struct sqlite_vm *sgi_vm;
+ struct sqlite *sgi_db;
+ uint32_t sgi_nerr;
} smb_giter_t;
typedef struct smb_group {
diff --git a/usr/src/lib/smbsrv/libsmb/common/smb_nic.c b/usr/src/lib/smbsrv/libsmb/common/smb_nic.c
index 332a39b0b3..e9a1521f75 100644
--- a/usr/src/lib/smbsrv/libsmb/common/smb_nic.c
+++ b/usr/src/lib/smbsrv/libsmb/common/smb_nic.c
@@ -47,6 +47,7 @@
#include <sys/systeminfo.h>
#include <smbsrv/libsmb.h>
+#include <sqlite-sys/sqlite.h>
#define SMB_NIC_DB_NAME "/var/smb/smbhosts.db"
#define SMB_NIC_DB_TIMEOUT 3000 /* in millisecond */
diff --git a/usr/src/lib/smbsrv/libsmb/common/smb_sqlite.h b/usr/src/lib/smbsrv/libsmb/common/smb_sqlite.h
index 336a478d54..e17a48ed00 100644
--- a/usr/src/lib/smbsrv/libsmb/common/smb_sqlite.h
+++ b/usr/src/lib/smbsrv/libsmb/common/smb_sqlite.h
@@ -26,13 +26,11 @@
#ifndef _SMB_SQLITE_H
#define _SMB_SQLITE_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
-#include <sqlite/sqlite.h>
+#include <sqlite-sys/sqlite.h>
#ifdef _LP64
/*
diff --git a/usr/src/lib/smbsrv/libsmb/i386/Makefile b/usr/src/lib/smbsrv/libsmb/i386/Makefile
index 7ac7d3d534..1e368c15be 100644
--- a/usr/src/lib/smbsrv/libsmb/i386/Makefile
+++ b/usr/src/lib/smbsrv/libsmb/i386/Makefile
@@ -22,12 +22,10 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.com
-LDLIBS += -lsqlite
+LDLIBS += -lsqlite-sys
DYNFLAGS += -R/usr/lib/smbsrv
install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/smbsrv/libsmb/sparc/Makefile b/usr/src/lib/smbsrv/libsmb/sparc/Makefile
index 7ac7d3d534..1e368c15be 100644
--- a/usr/src/lib/smbsrv/libsmb/sparc/Makefile
+++ b/usr/src/lib/smbsrv/libsmb/sparc/Makefile
@@ -22,12 +22,10 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.com
-LDLIBS += -lsqlite
+LDLIBS += -lsqlite-sys
DYNFLAGS += -R/usr/lib/smbsrv
install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/pkg/manifests/service-file-system-smb.mf b/usr/src/pkg/manifests/service-file-system-smb.mf
index 2ddf448a86..33df0fe870 100644
--- a/usr/src/pkg/manifests/service-file-system-smb.mf
+++ b/usr/src/pkg/manifests/service-file-system-smb.mf
@@ -82,7 +82,6 @@ file path=usr/lib/smbsrv/libmlrpc.so.1
file path=usr/lib/smbsrv/libmlsvc.so.1
file path=usr/lib/smbsrv/libsmb.so.1
file path=usr/lib/smbsrv/libsmbns.so.1
-file path=usr/lib/smbsrv/libsqlite.so.1
file path=usr/lib/smbsrv/smbd mode=0555
file path=usr/sbin/smbadm mode=0555
file path=usr/sbin/smbstat mode=0555
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index b9715719cd..3463041f8e 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -300,6 +300,7 @@ file path=lib/libsec.so.1
file path=lib/libsecdb.so.1
file path=lib/libsendfile.so.1
file path=lib/libsocket.so.1
+file path=lib/libsqlite-sys.so.2.8.15
file path=lib/libsysevent.so.1
file path=lib/libtermcap.so.1
file path=lib/libthread.so.1
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-04 14:27:12 +0000