diff options
| author | midipix <writeonce@midipix.org> | 2018-12-19 20:40:48 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2018-12-19 22:12:13 -0500 |
| commit | 6a10b33804f8aa52efeff7bf46174a4dfcd97b51 (patch) | |
| tree | 69555a9239791c6bf22ee86e478e435e10acc48c | |
| parent | c403d0d2a3a7a606c7cdd872a6c66a6491ffb687 (diff) | |
| download | sbpython3-6a10b33804f8aa52efeff7bf46174a4dfcd97b51.tar.bz2 sbpython3-6a10b33804f8aa52efeff7bf46174a4dfcd97b51.tar.xz | |
project: custom config: handle all expat-related bits at config-time.
| -rw-r--r-- | project/config/cfgdefs.sh | 13 | ||||
| -rw-r--r-- | 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 98d9365..c96e4c2 100644 --- a/project/depends.mk +++ b/project/depends.mk @@ -1,7 +1,4 @@ # shared extensions: dependency switches -CFLAGS_EXPAT += -DXML_DEV_URANDOM -LDFLAGS_EXPAT += -lexpat - CFLAGS_DBM += LDFLAGS_DBM += -lgdbm_compat @@ -11,6 +8,5 @@ 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_EXPAT_STATIC += $(LDFLAGS_EXPAT) LDFLAGS_DBM_STATIC += $(LDFLAGS_DBM) LDFLAGS_TCLTK_STATIC += $(LDFLAGS_TCLTK) |