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
|
Description: Use System SQLite library, not vendorized version
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2018-06-28
Forwarded: not-needed
Index: cctools-7.14.5/chirp/src/Makefile
===================================================================
--- cctools-7.14.5.orig/chirp/src/Makefile
+++ cctools-7.14.5/chirp/src/Makefile
@@ -2,7 +2,7 @@ include ../../config.mk
include ../../rules.mk
# Globus is needed by all executables via libdttools.a/auth_globus.o
-LOCAL_LINKAGE = $(CCTOOLS_GLOBUS_LDFLAGS)
+LOCAL_LINKAGE = $(CCTOOLS_GLOBUS_LDFLAGS) -lsqlite3
EXTERNAL_DEPENDENCIES = ../../dttools/src/libdttools.a
LIBRARIES = libchirp.a
@@ -24,7 +24,7 @@ chirp: chirp_tool.o
ifeq ($(CCTOOLS_STATIC),1)
$(CCTOOLS_LD) -static -g -o $@ $(LOCAL_LINKAGE) $^ $(CCTOOLS_STATIC_LINKAGE)
else
- $(CCTOOLS_LD) -o $@ $(CCTOOLS_INTERNAL_LDFLAGS) $(LOCAL_LDFLAGS) $^ $(LOCAL_LINKAGE) $(CCTOOLS_READLINE_LDFLAGS) $(CCTOOLS_EXTERNAL_LINKAGE) $(CCTOOLS_READLINE_LDFLAGS)
+ $(CCTOOLS_LD) -o $@ $(CCTOOLS_INTERNAL_LDFLAGS) $(LOCAL_LDFLAGS) $^ $(LOCAL_LINKAGE) $(CCTOOLS_READLINE_LDFLAGS) $(CCTOOLS_EXTERNAL_LINKAGE) $(CCTOOLS_READLINE_LDFLAGS) -lsqlite3
endif
ifeq ($(CCTOOLS_STATIC),1)
Index: cctools-7.14.5/devel/confuga/src/chirp_sqlite.c
===================================================================
--- cctools-7.14.5.orig/devel/confuga/src/chirp_sqlite.c
+++ cctools-7.14.5/devel/confuga/src/chirp_sqlite.c
@@ -10,7 +10,7 @@ See the file COPYING for details.
#include "json.h"
#include "json_aux.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
#include <errno.h>
#include <float.h>
|
