diff --git a/BuildTools/ubuntu/GNUmakefile b/BuildTools/ubuntu/GNUmakefile index 150ef6809..b0b2f6a90 100644 --- a/BuildTools/ubuntu/GNUmakefile +++ b/BuildTools/ubuntu/GNUmakefile @@ -72,11 +72,11 @@ build-geoda-mac: cp $(GEODA_HOME)/libraries/lib/libproj.so.0.7.0 build/plugins/libproj.so.0 cp $(GEODA_HOME)/libraries/lib/libgeos_c.so.1.7.8 build/plugins/libgeos_c.so.1 cp $(GEODA_HOME)/libraries/lib/libsqlite3.so.0.8.6 build/plugins/libsqlite3.so.0 - cp $(GEODA_HOME)/libraries/lib/libiconv.so.2.5.0 build/plugins/libiconv.so.2 + cp $(GEODA_HOME)/libraries/lib/libiconv.so.2.5.1 build/plugins/libiconv.so.2 chmod +x build/plugins/libiconv.so.2 cp $(GEODA_HOME)/libraries/lib/libminizip.so.0.0.0 build/plugins/libminizip.so.0 cp $(GEODA_HOME)/libraries/lib/liburiparser.so.1.0.5 build/plugins/liburiparser.so.1 - cp $(GEODA_HOME)/libraries/lib/libgeos-3.3.8.so build/plugins/ + cp $(GEODA_HOME)/libraries/lib/libgeos-3.3.8.so build/plugins/libgeos-3.3.8.so cp libraries/share/gdal/* build/gdaldata clean: diff --git a/BuildTools/ubuntu/build.sh b/BuildTools/ubuntu/build.sh index 7de38d75b..8802998ff 100755 --- a/BuildTools/ubuntu/build.sh +++ b/BuildTools/ubuntu/build.sh @@ -131,9 +131,21 @@ echo "%%%%%%%%%%%%%%%%%%%%%%" fi } + +######################################################################### +# install c-ares -- for cURL, prevent crash on Mac oSx with threads +######################################################################### +install_library c-ares-1.10.0 http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz libcares.a + + + ######################################################################### # install cURL ######################################################################### +echo "" +echo "%%%%%%%%%%%%%%%%%%%%%%" +echo "% Building: cURL%" +echo "%%%%%%%%%%%%%%%%%%%%%%" LIB_NAME=curl-7.46.0 LIB_CHECKER=libcurl.a @@ -311,7 +323,7 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%" { LIB_NAME=libspatialite-4.0.0 LIB_URL=https://dl.dropboxusercontent.com/u/145979/geoda_libraries/libspatialite-4.0.0.tar.gz - LIB_FILENAME=$(basename "$LIB_URL" ".tar.gz") + LIB_FILENAME=$LIB_NAME.tar.gz LIB_CHECKER=libspatialite.a echo $LIB_FILENAME @@ -437,7 +449,7 @@ echo $LIB_FILENAME cd $DOWNLOAD_HOME if ! [ -d "$LIB_NAME" ]; then - curl -o https://dl.dropboxusercontent.com/u/145979/geoda_libraries/json_spirit_v4.08.zip + curl -O https://dl.dropboxusercontent.com/u/145979/geoda_libraries/json_spirit_v4.08.zip unzip $LIB_FILENAME fi @@ -569,7 +581,7 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" ./configure cp -rf $GEODA_HOME/dep/gdal-1.9.2/* . cp GDALmake.opt GDALmake.opt - #make clean + make clean $MAKER make install #cd ogr/ogrsf_frmts/oci