summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-12-19 20:40:48 -0500
committermidipix <writeonce@midipix.org>2018-12-19 20:51:37 -0500
commitd1b52c06d0f406184a0356b7b2a012a5c0abed32 (patch)
treef2dd228e3d78b59f46e8b9d1f7872561a100f7a6
parent7219fdc0a016e1bc7740a352ff83b0e3727a524e (diff)
downloadsbpython2-d1b52c06d0f406184a0356b7b2a012a5c0abed32.tar.bz2
sbpython2-d1b52c06d0f406184a0356b7b2a012a5c0abed32.tar.xz
project: custom config: handle all expat-related bits at config-time.
-rw-r--r--project/config/cfgdefs.sh13
-rw-r--r--project/depends.mk4
2 files changed, 13 insertions, 4 deletions
diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh
index 61482d3..8e304fd 100644
--- a/project/config/cfgdefs.sh
+++ b/project/config/cfgdefs.sh
@@ -231,6 +231,19 @@ cfgdefs_perform_target_tests()
mb_cfgtest_makevar='LDFLAGS_SQLITE_STATIC'
cfgtest_makevar_append '$(LDFLAGS_SQLITE)'
+ # expat
+ cfgtest_newline
+ cfgtest_comment 'expat'
+
+ mb_cfgtest_makevar='CFLAGS_EXPAT'
+ cfgtest_makevar_append '-DXML_DEV_URANDOM'
+
+ mb_cfgtest_makevar='LDFLAGS_EXPAT'
+ cfgtest_makevar_append '-lexpat'
+
+ mb_cfgtest_makevar='LDFLAGS_EXPAT_STATIC'
+ cfgtest_makevar_append '$(LDFLAGS_EXPAT)'
+
# pretty cfgdefs.mk
cfgtest_newline
}
diff --git a/project/depends.mk b/project/depends.mk
index 0c71acf..3101632 100644
--- a/project/depends.mk
+++ b/project/depends.mk
@@ -1,12 +1,8 @@
# shared extensions: dependency switches
-CFLAGS_EXPAT = -DXML_DEV_URANDOM
-LDFLAGS_EXPAT = -lexpat
-
CFLAGS_DBM = -DHAVE_NDBM_H
LDFLAGS_DBM = -lgdbm_compat
# static extensions: dependency switch
LDFLAGS_PYEXT_STATIC = -lssl -lcrypto -lreadline -lbz2 -lgdbm -lffi -lintl -lz
-LDFLAGS_EXPAT_STATIC = $(LDFLAGS_EXPAT)
LDFLAGS_DBM_STATIC = $(LDFLAGS_DBM)