summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-12-19 20:35:26 -0500
committermidipix <writeonce@midipix.org>2018-12-19 22:12:13 -0500
commitc403d0d2a3a7a606c7cdd872a6c66a6491ffb687 (patch)
tree8ecdab33925c484f83caf9fe8c5f6067d8ea5986 /project
parentbc7614b9705c62b62a356408afa3578d1e519512 (diff)
downloadsbpython3-c403d0d2a3a7a606c7cdd872a6c66a6491ffb687.tar.bz2
sbpython3-c403d0d2a3a7a606c7cdd872a6c66a6491ffb687.tar.xz
project: custom config: handle all sqlite-related bits at config-time.
Diffstat (limited to 'project')
-rw-r--r--project/config/cfgdefs.sh14
-rw-r--r--project/depends.mk6
2 files changed, 14 insertions, 6 deletions
diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh
index 492dd3f..61482d3 100644
--- a/project/config/cfgdefs.sh
+++ b/project/config/cfgdefs.sh
@@ -217,6 +217,20 @@ cfgdefs_perform_target_tests()
mb_cfgtest_makevar='LDFLAGS_TCLTK_LIBS'
cfgtest_makevar_append "$mb_tcltk_libs"
+ # sqlite
+ cfgtest_newline
+ cfgtest_comment 'sqlite3'
+
+ mb_cfgtest_makevar='CFLAGS_SQLITE'
+ cfgtest_makevar_append '-DMODULE_NAME=\"sqlite3\"'
+ cfgtest_makevar_append '-DSQLITE_OMIT_LOAD_EXTENSION'
+
+ mb_cfgtest_makevar='LDFLAGS_SQLITE'
+ cfgtest_makevar_append '-lsqlite3'
+
+ mb_cfgtest_makevar='LDFLAGS_SQLITE_STATIC'
+ cfgtest_makevar_append '$(LDFLAGS_SQLITE)'
+
# pretty cfgdefs.mk
cfgtest_newline
}
diff --git a/project/depends.mk b/project/depends.mk
index 6f18d9d..98d9365 100644
--- a/project/depends.mk
+++ b/project/depends.mk
@@ -1,9 +1,4 @@
# shared extensions: dependency switches
-CFLAGS_SQLITE += -I$(SYSROOT)/usr/local/include/sqlite3 -I$(SYSROOT)/usr/include/sqlite3
-CFLAGS_SQLITE += -DMODULE_NAME=\"sqlite3\"
-CFLAGS_SQLITE += -DSQLITE_OMIT_LOAD_EXTENSION
-LDFLAGS_SQLITE += -lsqlite3
-
CFLAGS_EXPAT += -DXML_DEV_URANDOM
LDFLAGS_EXPAT += -lexpat
@@ -16,7 +11,6 @@ LDFLAGS_TCLTK += $(LDFLAGS_TCLTK_LIBS)
# static extensions: dependency switch
LDFLAGS_PYEXT_STATIC += -lssl -lcrypto -lgdbm -lreadline
LDFLAGS_PYEXT_STATIC += -lbz2 -lffi -lintl -llzma -lz
-LDFLAGS_SQLITE_STATIC += $(LDFLAGS_SQLITE)
LDFLAGS_EXPAT_STATIC += $(LDFLAGS_EXPAT)
LDFLAGS_DBM_STATIC += $(LDFLAGS_DBM)
LDFLAGS_TCLTK_STATIC += $(LDFLAGS_TCLTK)