Merge commit 'a34a885031fcb1797621e8968497561a4837e06a' as 'third_party/mason'

third_party/mason/scripts/osm2pgsql/0.87.2/.travis.yml

@@ -0,0 +1,24 @@
+language: cpp
+
+sudo: false
+
+matrix:
+  include:
+    - os: osx
+      compiler: clang
+    - os: linux
+      compiler: clang
+
+env:
+  global:
+   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
+   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
+
+before_install:
+- source ./scripts/setup_cpp11_toolchain.sh
+
+script:
+- ./mason build ${MASON_NAME} ${MASON_VERSION}
+
+after_success:
+- ./mason publish ${MASON_NAME} ${MASON_VERSION}

third_party/mason/scripts/osm2pgsql/0.87.2/patch.diff

@@ -0,0 +1,15 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 29411)
++++ configure.ac	(working copy)
+@@ -29,10 +29,6 @@
+ dnl Find C++ compiler
+ AC_PROG_CXX
+ AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
+-if test "$HAVE_CXX" = "no" 
+-then
+-  AC_MSG_ERROR([Could not find a c++ compiler]);
+-fi
+ 
+ dnl AX_CFLAGS_WARN_ALL
+ dnl AX_CXXFLAGS_WARN_ALL

third_party/mason/scripts/osm2pgsql/0.87.2/script.sh

@@ -0,0 +1,107 @@
+#!/usr/bin/env bash
+
+MASON_NAME=osm2pgsql
+MASON_VERSION=0.87.2
+MASON_LIB_FILE=bin/osm2pgsql
+
+. ${MASON_DIR}/mason.sh
+
+function mason_load_source {
+    mason_download \
+        https://github.com/openstreetmap/osm2pgsql/archive/0.87.2.tar.gz \
+        f585876898e7cf48e1662c5e5a3c8b6787e0aa2b
+
+    mason_extract_tar_gz
+
+    export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
+}
+
+function mason_prepare_compile {
+    cd $(dirname ${MASON_ROOT})
+    # set up to fix libtool .la files
+    # https://github.com/mapbox/mason/issues/61
+    if [[ $(uname -s) == 'Darwin' ]]; then
+        FIND="\/Users\/travis\/build\/mapbox\/mason"
+    else
+        FIND="\/home\/travis\/build\/mapbox\/mason"
+    fi
+    REPLACE="$(pwd)"
+    REPLACE=${REPLACE////\\/}
+    ${MASON_DIR}/mason install boost 1.57.0
+    MASON_BOOST=$(${MASON_DIR}/mason prefix boost 1.57.0)
+    MASON_BOOST_LIBS=$(pwd)/mason_packages/.link/lib
+    ${MASON_DIR}/mason install boost_libsystem 1.57.0
+    ${MASON_DIR}/mason link boost_libsystem 1.57.0
+    ${MASON_DIR}/mason install boost_libthread 1.57.0
+    ${MASON_DIR}/mason link boost_libthread 1.57.0
+    MASON_BOOST_SYSTEM=$(${MASON_DIR}/mason prefix boost_libsystem 1.57.0)
+    ${MASON_DIR}/mason install boost_libfilesystem 1.57.0
+    ${MASON_DIR}/mason link boost_libfilesystem 1.57.0
+    ${MASON_DIR}/mason install libxml2 2.9.2
+    MASON_XML2=$(${MASON_DIR}/mason prefix libxml2 2.9.2)
+    perl -i -p -e "s/${FIND}/${REPLACE}/g;" ${MASON_XML2}/bin/xml2-config
+    ${MASON_DIR}/mason install geos 3.4.2
+    MASON_GEOS=$(${MASON_DIR}/mason prefix geos 3.4.2)
+    perl -i -p -e "s/${FIND}/${REPLACE}/g;" ${MASON_GEOS}/bin/geos-config
+    ${MASON_DIR}/mason install proj 4.8.0
+    MASON_PROJ=$(${MASON_DIR}/mason prefix proj 4.8.0)
+    ${MASON_DIR}/mason install bzip 1.0.6
+    MASON_BZIP=$(${MASON_DIR}/mason prefix bzip 1.0.6)
+    # depends on sudo apt-get install zlib1g-dev
+    ${MASON_DIR}/mason install zlib system
+    MASON_ZLIB=$(${MASON_DIR}/mason prefix zlib system)
+    ${MASON_DIR}/mason install protobuf 2.6.1
+    MASON_PROTOBUF=$(${MASON_DIR}/mason prefix protobuf 2.6.1)
+    ${MASON_DIR}/mason install protobuf_c 1.1.0
+    MASON_PROTOBUF_C=$(${MASON_DIR}/mason prefix protobuf_c 1.1.0)
+    ${MASON_DIR}/mason install libpq 9.4.1
+    MASON_LIBPQ=$(${MASON_DIR}/mason prefix libpq 9.4.1)
+}
+
+function mason_compile {
+    mason_step "Loading patch 'https://github.com/mapbox/mason/blob/${MASON_SLUG}/patch.diff'..."
+    curl --retry 3 -s -f -# -L \
+      https://raw.githubusercontent.com/mapbox/mason/${MASON_SLUG}/patch.diff \
+      -O || (mason_error "Could not find patch for ${MASON_SLUG}" && exit 1)
+    patch -N -p0 < ./patch.diff
+    NOCONFIGURE=1 ./autogen.sh
+    # --without-lockfree to workaround https://github.com/openstreetmap/osm2pgsql/issues/196
+    # parse-o5m.cpp:405:58: error: invalid suffix on literal
+    LDFLAGS="-L${MASON_BOOST_LIBS} -lboost_thread ${LDFLAGS}"
+    if [[ $(uname -s) == 'Linux' ]]; then
+        LDFLAGS="${LDFLAGS} -lrt"
+    fi
+    CXXFLAGS="-Wno-reserved-user-defined-literal ${CXXFLAGS} -I${MASON_PROTOBUF_C}/include" LDFLAGS="${LDFLAGS}" ./configure \
+        --enable-static --disable-shared \
+        ${MASON_HOST_ARG} \
+        --prefix=${MASON_PREFIX} \
+        --without-lockfree \
+        --with-boost=${MASON_BOOST} \
+        --with-boost-libdir=${MASON_BOOST_LIBS} \
+        --with-libxml2=${MASON_XML2}/bin/xml2-config \
+        --with-zlib=${MASON_ZLIB} \
+        --with-bzip2=${MASON_BZIP} \
+        --with-geos=${MASON_GEOS}/bin/geos-config \
+        --with-proj=${MASON_PROJ} \
+        --with-protobuf-c=${MASON_PROTOBUF_C} \
+        --with-protobuf-c-inc=${MASON_PROTOBUF_C}/include \
+        --with-protobuf-c-lib=${MASON_PROTOBUF_C}/lib \
+        --with-postgresql=${MASON_LIBPQ}/bin/pg_config
+
+    make -j${MASON_CONCURRENCY}
+    make install
+}
+
+function mason_cflags {
+    :
+}
+
+function mason_ldflags {
+    :
+}
+
+function mason_clean {
+    make clean
+}
+
+mason_run "$@"

third_party/mason/scripts/osm2pgsql/0.88.1/.travis.yml

@@ -0,0 +1,24 @@
+language: cpp
+
+sudo: false
+
+matrix:
+  include:
+    - os: osx
+      compiler: clang
+    - os: linux
+      compiler: clang
+
+env:
+  global:
+   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
+   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
+
+before_install:
+- source ./scripts/setup_cpp11_toolchain.sh
+
+script:
+- ./mason build ${MASON_NAME} ${MASON_VERSION}
+
+after_success:
+- ./mason publish ${MASON_NAME} ${MASON_VERSION}

third_party/mason/scripts/osm2pgsql/0.88.1/patch.diff

@@ -0,0 +1,15 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 29411)
++++ configure.ac	(working copy)
+@@ -29,10 +29,6 @@
+ dnl Find C++ compiler
+ AC_PROG_CXX
+ AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
+-if test "$HAVE_CXX" = "no" 
+-then
+-  AC_MSG_ERROR([Could not find a c++ compiler]);
+-fi
+ 
+ dnl AX_CFLAGS_WARN_ALL
+ dnl AX_CXXFLAGS_WARN_ALL

third_party/mason/scripts/osm2pgsql/0.88.1/script.sh

@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+
+MASON_NAME=osm2pgsql
+MASON_VERSION=0.88.1
+MASON_LIB_FILE=bin/osm2pgsql
+
+. ${MASON_DIR}/mason.sh
+
+function mason_load_source {
+    mason_download \
+        https://github.com/openstreetmap/osm2pgsql/archive/0.88.1.tar.gz \
+        24d58477f3f9b8406af115f9eb2bab51ac64e09d
+
+    mason_extract_tar_gz
+
+    export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
+}
+
+function mason_prepare_compile {
+    cd $(dirname ${MASON_ROOT})
+    # set up to fix libtool .la files
+    # https://github.com/mapbox/mason/issues/61
+    if [[ $(uname -s) == 'Darwin' ]]; then
+        FIND="\/Users\/travis\/build\/mapbox\/mason"
+    else
+        FIND="\/home\/travis\/build\/mapbox\/mason"
+    fi
+    REPLACE="$(pwd)"
+    REPLACE=${REPLACE////\\/}
+    ${MASON_DIR}/mason install boost 1.57.0
+    MASON_BOOST=$(${MASON_DIR}/mason prefix boost 1.57.0)
+    MASON_BOOST_LIBS=$(pwd)/mason_packages/.link/lib
+    ${MASON_DIR}/mason install boost_libsystem 1.57.0
+    ${MASON_DIR}/mason link boost_libsystem 1.57.0
+    ${MASON_DIR}/mason install boost_libthread 1.57.0
+    ${MASON_DIR}/mason link boost_libthread 1.57.0
+    MASON_BOOST_SYSTEM=$(${MASON_DIR}/mason prefix boost_libsystem 1.57.0)
+    ${MASON_DIR}/mason install boost_libfilesystem 1.57.0
+    ${MASON_DIR}/mason link boost_libfilesystem 1.57.0
+    ${MASON_DIR}/mason install libxml2 2.9.2
+    ${MASON_DIR}/mason link libxml2 2.9.2
+    MASON_XML2=$(${MASON_DIR}/mason prefix libxml2 2.9.2)
+    perl -i -p -e "s/${FIND}/${REPLACE}/g;" ${MASON_XML2}/bin/xml2-config
+    ${MASON_DIR}/mason install geos 3.4.2
+    ${MASON_DIR}/mason link geos 3.4.2
+    MASON_LINKED_HEADERS=$(pwd)/mason_packages/.link/include
+    MASON_GEOS=$(${MASON_DIR}/mason prefix geos 3.4.2)
+    perl -i -p -e "s/${FIND}/${REPLACE}/g;" ${MASON_GEOS}/bin/geos-config
+    ${MASON_DIR}/mason install proj 4.8.0
+    MASON_PROJ=$(${MASON_DIR}/mason prefix proj 4.8.0)
+    ${MASON_DIR}/mason install bzip 1.0.6
+    MASON_BZIP=$(${MASON_DIR}/mason prefix bzip 1.0.6)
+    # depends on sudo apt-get install zlib1g-dev
+    ${MASON_DIR}/mason install zlib system
+    MASON_ZLIB=$(${MASON_DIR}/mason prefix zlib system)
+    ${MASON_DIR}/mason install protobuf 2.6.1
+    MASON_PROTOBUF=$(${MASON_DIR}/mason prefix protobuf 2.6.1)
+    ${MASON_DIR}/mason install protobuf_c 1.1.0
+    MASON_PROTOBUF_C=$(${MASON_DIR}/mason prefix protobuf_c 1.1.0)
+    ${MASON_DIR}/mason install libpq 9.4.1
+    MASON_LIBPQ=$(${MASON_DIR}/mason prefix libpq 9.4.1)
+}
+
+function mason_compile {
+    mason_step "Loading patch 'https://github.com/mapbox/mason/blob/${MASON_SLUG}/patch.diff'..."
+    curl --retry 3 -s -f -# -L \
+      https://raw.githubusercontent.com/mapbox/mason/${MASON_SLUG}/patch.diff \
+      -O || (mason_error "Could not find patch for ${MASON_SLUG}" && exit 1)
+    patch -N -p0 < ./patch.diff
+    NOCONFIGURE=1 ./autogen.sh
+    # --without-lockfree to workaround https://github.com/openstreetmap/osm2pgsql/issues/196
+    # parse-o5m.cpp:405:58: error: invalid suffix on literal
+    LDFLAGS="-L${MASON_BOOST_LIBS} -lboost_thread ${LDFLAGS}"
+    if [[ $(uname -s) == 'Linux' ]]; then
+        LDFLAGS="${LDFLAGS} -lrt"
+    fi
+    # -I${MASON_GEOS_HEADER} works around geos-config hardcoding the platform - which breaks if built on OS X 10.10 but building on 10.11
+    CFLAGS="-I${MASON_LINKED_HEADERS} -I${MASON_LINKED_HEADERS}/libxml2 ${CFLAGS}" CXXFLAGS="-I${MASON_LINKED_HEADERS} -I${MASON_LINKED_HEADERS}/libxml2 -Wno-reserved-user-defined-literal ${CXXFLAGS} -I${MASON_PROTOBUF_C}/include" LDFLAGS="${LDFLAGS}" ./configure \
+        --enable-static --disable-shared \
+        ${MASON_HOST_ARG} \
+        --prefix=${MASON_PREFIX} \
+        --without-lockfree \
+        --with-boost=${MASON_BOOST} \
+        --with-boost-libdir=${MASON_BOOST_LIBS} \
+        --with-libxml2=${MASON_XML2}/bin/xml2-config \
+        --with-zlib=${MASON_ZLIB} \
+        --with-bzip2=${MASON_BZIP} \
+        --with-geos=${MASON_GEOS}/bin/geos-config \
+        --with-proj=${MASON_PROJ} \
+        --with-protobuf-c=${MASON_PROTOBUF_C} \
+        --with-protobuf-c-inc=${MASON_PROTOBUF_C}/include \
+        --with-protobuf-c-lib=${MASON_PROTOBUF_C}/lib \
+        --with-postgresql=${MASON_LIBPQ}/bin/pg_config
+
+    make -j${MASON_CONCURRENCY}
+    make install
+}
+
+function mason_cflags {
+    :
+}
+
+function mason_ldflags {
+    :
+}
+
+function mason_clean {
+    make clean
+}
+
+mason_run "$@"