sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mason bootstrap: expat and sqlite_rtree fixes

Browse source
This commit is contained in:
Dane Springmeyer 2015-01-24 08:51:16 -08:00
parent d930265467
commit 93570f820a
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -1476,6 +1476,11 @@ if not preconfigured:
if not lib in env['LIBS']: if not lib in env['LIBS']:
env["SQLITE_LINKFLAGS"].append("lib") env["SQLITE_LINKFLAGS"].append("lib")
env.Append(LIBS=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() SQLITE_HAS_RTREE = conf.sqlite_has_rtree()
if not SQLITE_HAS_RTREE: if not SQLITE_HAS_RTREE:
env.Replace(**sqlite_backup) env.Replace(**sqlite_backup)

3
bootstrap.sh
View file

@ -119,6 +119,9 @@ DEPS["boost_libpython"]="1.57.0"
DEPS["gdal"]="1.11.1" DEPS["gdal"]="1.11.1"
DEPS["libpq"]="9.4.0" DEPS["libpq"]="9.4.0"
DEPS["sqlite"]="3.8.6" DEPS["sqlite"]="3.8.6"
# gdal deps
DEPS["expat"]="2.1.0"
if [[ -d ~/.mason ]]; then if [[ -d ~/.mason ]]; then
export PATH=~/.mason:$PATH export PATH=~/.mason:$PATH