mason bootstrap: expat and sqlite_rtree fixes
This commit is contained in:
parent
d930265467
commit
93570f820a
2 changed files with 8 additions and 0 deletions
|
@ -1476,6 +1476,11 @@ if not preconfigured:
|
|||
if not lib in env['LIBS']:
|
||||
env["SQLITE_LINKFLAGS"].append("lib")
|
||||
env.Append(LIBS=lib)
|
||||
else:
|
||||
for lib in ["sqlite3","dl","pthread"]:
|
||||
if not lib in env['LIBS']:
|
||||
env["SQLITE_LINKFLAGS"].append("lib")
|
||||
env.Append(LIBS=lib)
|
||||
SQLITE_HAS_RTREE = conf.sqlite_has_rtree()
|
||||
if not SQLITE_HAS_RTREE:
|
||||
env.Replace(**sqlite_backup)
|
||||
|
|
|
@ -119,6 +119,9 @@ DEPS["boost_libpython"]="1.57.0"
|
|||
DEPS["gdal"]="1.11.1"
|
||||
DEPS["libpq"]="9.4.0"
|
||||
DEPS["sqlite"]="3.8.6"
|
||||
# gdal deps
|
||||
DEPS["expat"]="2.1.0"
|
||||
|
||||
|
||||
if [[ -d ~/.mason ]]; then
|
||||
export PATH=~/.mason:$PATH
|
||||
|
|
Loading…
Reference in a new issue