From d1b52c06d0f406184a0356b7b2a012a5c0abed32 Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 19 Dec 2018 20:40:48 -0500 Subject: project: custom config: handle all expat-related bits at config-time. --- project/config/cfgdefs.sh | 13 +++++++++++++ project/depends.mk | 4 ---- 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) -- cgit v1.2.3