blob: 59ea3209a21553dec5c067abc0edcb81f4de21f5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
Index: svc.configd/usr/src/cmd/svc/configd/Makefile
===================================================================
--- svc.configd.orig/usr/src/cmd/svc/configd/Makefile 2014-03-01 16:18:04.000000000 +0400
+++ svc.configd/usr/src/cmd/svc/configd/Makefile 2014-04-17 12:11:32.688390408 +0400
@@ -48,7 +48,7 @@
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 -D_REENTRANT
CPPFLAGS += $(MYCPPFLAGS)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
@@ -58,7 +58,7 @@
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-uninitialized
MYLDLIBS = -lumem -luutil -lbsm
-LDLIBS += -lsecdb $(MYLDLIBS)
+LDLIBS += -lsecdb $(MYLDLIBS) -lsqlite
LINTFLAGS += -errtags -erroff=E_BAD_FORMAT_ARG_TYPE2 -erroff=E_NAME_DEF_NOT_USED2
CLOBBERFILES += $(MYPROG:%=%-native)
@@ -81,17 +81,11 @@
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
-
OBJS += $(LIBSQLITE)
install := TARGET = install
clobber := TARGET = clobber
-lint := LDLIBS += $(SQLITELINT)
-
.KEEP_STATE:
.PARALLEL: $(MYOBJS) $(MYOBJS:%.o=%-native.o)
Index: svc.configd/usr/src/cmd/svc/configd/backend.c
===================================================================
--- svc.configd.orig/usr/src/cmd/svc/configd/backend.c 2014-03-01 16:18:04.000000000 +0400
+++ svc.configd/usr/src/cmd/svc/configd/backend.c 2014-04-17 12:11:02.618855861 +0400
@@ -56,7 +56,7 @@
#include "repcache_protocol.h"
#include <sqlite.h>
-#include <sqlite-misc.h>
+extern const char * sqlite_temp_directory;
/*
* This file has two purposes:
|
