summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-12-19 20:35:26 -0500
committermidipix <writeonce@midipix.org>2018-12-19 20:51:36 -0500
commit7219fdc0a016e1bc7740a352ff83b0e3727a524e (patch)
tree12372d9817eff7f5ad4e4ef5b7524e3c4543b1da
parentc2e600e53977ee7fee6e25ecce0b366cc8be6347 (diff)
downloadsbpython2-7219fdc0a016e1bc7740a352ff83b0e3727a524e.tar.bz2
sbpython2-7219fdc0a016e1bc7740a352ff83b0e3727a524e.tar.xz
project: custom config: handle all sqlite-related bits at config-time.
-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 e5fe7d5..0c71acf 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
@@ -13,6 +8,5 @@ LDFLAGS_DBM = -lgdbm_compat
# static extensions: dependency switch
LDFLAGS_PYEXT_STATIC = -lssl -lcrypto -lreadline -lbz2 -lgdbm -lffi -lintl -lz
-LDFLAGS_SQLITE_STATIC = $(LDFLAGS_SQLITE)
LDFLAGS_EXPAT_STATIC = $(LDFLAGS_EXPAT)
LDFLAGS_DBM_STATIC = $(LDFLAGS_DBM)