From 5eb81a0f46238801ba9e5fa32b78fcbbbda23875 Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Wed, 15 Jul 2020 18:45:37 -0400
Subject: [PATCH 01/12] Add libpostal installation in mason with a script.sh

---
 scripts/libpostal/1.1-alpha/script.sh | 63 +++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 scripts/libpostal/1.1-alpha/script.sh

diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
new file mode 100644
index 000000000..373649a8e
--- /dev/null
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+MASON_NAME=libpostal
+MASON_VERSION=1.1-alpha
+MASON_LIB_FILE=bin/libpostal
+
+. ${MASON_DIR}/mason.sh
+
+function mason_load_source {
+    mason_download \
+        https://github.com/osmcode/${MASON_NAME}/archive/v${MASON_VERSION}.tar.gz \
+        43795a3d903991d3864926393af10c3ec31a161c
+
+    mason_extract_tar_gz
+
+    export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
+}
+
+function mason_prepare_compile {
+    CCACHE_VERSION=3.3.4
+    ${MASON_DIR}/mason install ccache ${CCACHE_VERSION}
+    MASON_CCACHE=$(${MASON_DIR}/mason prefix ccache ${CCACHE_VERSION})
+    ${MASON_DIR}/mason install cmake 3.15.2
+    ${MASON_DIR}/mason link cmake 3.15.2
+
+    yum install -y curl autoconf automake libtool python-devel pkgconfig geos geos-devel jq
+}
+
+function mason_compile {
+    rm -rf build
+    mkdir -p build
+    cd build
+    CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
+    ${MASON_ROOT}/.link/bin/cmake \
+        -DCMAKE_INSTALL_PREFIX=${MASON_PREFIX} \
+        -DCMAKE_CXX_COMPILER_LAUNCHER="${MASON_CCACHE}/bin/ccache" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DBoost_NO_SYSTEM_PATHS=ON \
+        -DBoost_USE_STATIC_LIBS=ON \
+        ..
+    # limit concurrency on travis to avoid heavy jobs being killed
+    if [[ ${TRAVIS_OS_NAME:-} ]]; then
+        make VERBOSE=1 -j4
+    else
+        make VERBOSE=1 -j${MASON_CONCURRENCY}
+    fi
+    make install
+
+}
+
+function mason_cflags {
+    :
+}
+
+function mason_ldflags {
+    :
+}
+
+function mason_static_libs {
+    :
+}
+
+mason_run "$@"
\ No newline at end of file

From 156a8bc1763cef88038fab6613f1e010cff83ec3 Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Wed, 15 Jul 2020 18:49:30 -0400
Subject: [PATCH 02/12] ...

---
 scripts/libpostal/1.1-alpha/script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
index 373649a8e..a0205a6f9 100644
--- a/scripts/libpostal/1.1-alpha/script.sh
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -8,7 +8,7 @@ MASON_LIB_FILE=bin/libpostal
 
 function mason_load_source {
     mason_download \
-        https://github.com/osmcode/${MASON_NAME}/archive/v${MASON_VERSION}.tar.gz \
+        https://github.com/openvenues/${MASON_NAME}/archive/v${MASON_VERSION}.tar.gz \
         43795a3d903991d3864926393af10c3ec31a161c
 
     mason_extract_tar_gz

From fc845b541074f27e11a46a4e24d079b7b56d6361 Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Wed, 15 Jul 2020 18:52:20 -0400
Subject: [PATCH 03/12] ...

---
 scripts/libpostal/1.1-alpha/script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
index a0205a6f9..e19d6889c 100644
--- a/scripts/libpostal/1.1-alpha/script.sh
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -9,7 +9,7 @@ MASON_LIB_FILE=bin/libpostal
 function mason_load_source {
     mason_download \
         https://github.com/openvenues/${MASON_NAME}/archive/v${MASON_VERSION}.tar.gz \
-        43795a3d903991d3864926393af10c3ec31a161c
+        4a04fb727b0b157b55953132e4ab7c7413dcad03
 
     mason_extract_tar_gz
 

From 980b3189dca6f61295046cc8a5115ee051365b0e Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Wed, 15 Jul 2020 19:02:51 -0400
Subject: [PATCH 04/12] ...

---
 scripts/libpostal/1.1-alpha/script.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
index e19d6889c..bfa84c10b 100644
--- a/scripts/libpostal/1.1-alpha/script.sh
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -9,7 +9,7 @@ MASON_LIB_FILE=bin/libpostal
 function mason_load_source {
     mason_download \
         https://github.com/openvenues/${MASON_NAME}/archive/v${MASON_VERSION}.tar.gz \
-        4a04fb727b0b157b55953132e4ab7c7413dcad03
+        b9a4972d0f2fcdc8b24ef91adf4a7749865f4865
 
     mason_extract_tar_gz
 
@@ -23,7 +23,7 @@ function mason_prepare_compile {
     ${MASON_DIR}/mason install cmake 3.15.2
     ${MASON_DIR}/mason link cmake 3.15.2
 
-    yum install -y curl autoconf automake libtool python-devel pkgconfig geos geos-devel jq
+    # brew install curl autoconf automake libtool python-devel pkgconfig geos geos-devel jq
 }
 
 function mason_compile {
@@ -31,6 +31,7 @@ function mason_compile {
     mkdir -p build
     cd build
     CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
+
     ${MASON_ROOT}/.link/bin/cmake \
         -DCMAKE_INSTALL_PREFIX=${MASON_PREFIX} \
         -DCMAKE_CXX_COMPILER_LAUNCHER="${MASON_CCACHE}/bin/ccache" \
@@ -38,6 +39,8 @@ function mason_compile {
         -DBoost_NO_SYSTEM_PATHS=ON \
         -DBoost_USE_STATIC_LIBS=ON \
         ..
+
+    echo "THIS IS SUCCESSFULL"
     # limit concurrency on travis to avoid heavy jobs being killed
     if [[ ${TRAVIS_OS_NAME:-} ]]; then
         make VERBOSE=1 -j4

From 8010bd2b888df5ea5af7332343e7af9a037f1bea Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Wed, 15 Jul 2020 19:03:07 -0400
Subject: [PATCH 05/12] ...

---
 scripts/libpostal/1.1-alpha/script.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
index bfa84c10b..0b28d2f09 100644
--- a/scripts/libpostal/1.1-alpha/script.sh
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -40,7 +40,6 @@ function mason_compile {
         -DBoost_USE_STATIC_LIBS=ON \
         ..
 
-    echo "THIS IS SUCCESSFULL"
     # limit concurrency on travis to avoid heavy jobs being killed
     if [[ ${TRAVIS_OS_NAME:-} ]]; then
         make VERBOSE=1 -j4

From 3b9737b9d3b23ea38c7628d16d5193b06d4a76c8 Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Wed, 15 Jul 2020 19:04:58 -0400
Subject: [PATCH 06/12] stash

---
 scripts/libpostal/1.1-alpha/script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
index 0b28d2f09..ba64458b7 100644
--- a/scripts/libpostal/1.1-alpha/script.sh
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -23,7 +23,7 @@ function mason_prepare_compile {
     ${MASON_DIR}/mason install cmake 3.15.2
     ${MASON_DIR}/mason link cmake 3.15.2
 
-    # brew install curl autoconf automake libtool python-devel pkgconfig geos geos-devel jq
+    # yum install curl autoconf automake libtool python-devel pkgconfig geos geos-devel jq
 }
 
 function mason_compile {

From add138bc91527ce73a26a1255b542d8d868f8b42 Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Thu, 23 Jul 2020 15:54:36 -0400
Subject: [PATCH 07/12] cleanup

---
 scripts/libpostal/1.1-alpha/script.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
index ba64458b7..440d9720a 100644
--- a/scripts/libpostal/1.1-alpha/script.sh
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -21,17 +21,21 @@ function mason_prepare_compile {
     ${MASON_DIR}/mason install ccache ${CCACHE_VERSION}
     MASON_CCACHE=$(${MASON_DIR}/mason prefix ccache ${CCACHE_VERSION})
     ${MASON_DIR}/mason install cmake 3.15.2
+    MASON_CCACHE=$(${MASON_DIR}/mason prefix ccache ${CCACHE_VERSION})
+    ${MASON_DIR}/mason install cmake 3.15.2
     ${MASON_DIR}/mason link cmake 3.15.2
 
     # yum install curl autoconf automake libtool python-devel pkgconfig geos geos-devel jq
+
 }
 
 function mason_compile {
-    rm -rf build
-    mkdir -p build
-    cd build
-    CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
+    echo "LOG"
+    echo "mason prefix : " $MASON_PREFIX
+    echo "mason root : " $MASON_ROOT
+    echo "mason cache : " $MASON_CCACHE
 
+    CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
     ${MASON_ROOT}/.link/bin/cmake \
         -DCMAKE_INSTALL_PREFIX=${MASON_PREFIX} \
         -DCMAKE_CXX_COMPILER_LAUNCHER="${MASON_CCACHE}/bin/ccache" \
@@ -39,7 +43,6 @@ function mason_compile {
         -DBoost_NO_SYSTEM_PATHS=ON \
         -DBoost_USE_STATIC_LIBS=ON \
         ..
-
     # limit concurrency on travis to avoid heavy jobs being killed
     if [[ ${TRAVIS_OS_NAME:-} ]]; then
         make VERBOSE=1 -j4
@@ -47,7 +50,6 @@ function mason_compile {
         make VERBOSE=1 -j${MASON_CONCURRENCY}
     fi
     make install
-
 }
 
 function mason_cflags {

From 32b75c086e622107eeb4db202754d95f825b75c0 Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Thu, 23 Jul 2020 15:55:49 -0400
Subject: [PATCH 08/12] cleanup

---
 scripts/libpostal/1.1-alpha/script.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
index 440d9720a..c375c339f 100644
--- a/scripts/libpostal/1.1-alpha/script.sh
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -25,8 +25,6 @@ function mason_prepare_compile {
     ${MASON_DIR}/mason install cmake 3.15.2
     ${MASON_DIR}/mason link cmake 3.15.2
 
-    # yum install curl autoconf automake libtool python-devel pkgconfig geos geos-devel jq
-
 }
 
 function mason_compile {

From 7541d8ff7287dc3114530e68ea4587660ebfba2f Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Thu, 23 Jul 2020 15:57:03 -0400
Subject: [PATCH 09/12] add travis file

---
 scripts/libpostal/1.1-alpha/.travis.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 scripts/libpostal/1.1-alpha/.travis.yml

diff --git a/scripts/libpostal/1.1-alpha/.travis.yml b/scripts/libpostal/1.1-alpha/.travis.yml
new file mode 100644
index 000000000..931a05d57
--- /dev/null
+++ b/scripts/libpostal/1.1-alpha/.travis.yml
@@ -0,0 +1,22 @@
+language: generic
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode8
+      compiler: clang
+    - os: linux
+      sudo: false
+      addons:
+        apt:
+          sources:
+           - ubuntu-toolchain-r-test
+          packages:
+           - libstdc++-4.8-dev
+           - pandoc
+
+script:
+- if [[ $(uname -s) == 'Darwin' ]]; then brew install pandoc || true; fi;
+- ./mason build ${MASON_NAME} ${MASON_VERSION}
+- nm $(./mason prefix ${MASON_NAME} ${MASON_VERSION})/bin/osmium | grep "GLIBC" | c++filt  || true
+- ./mason publish ${MASON_NAME} ${MASON_VERSION}
\ No newline at end of file

From 2b9458b0dec8b6dbcd8734e0a7a608476cad8adb Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Thu, 23 Jul 2020 16:04:14 -0400
Subject: [PATCH 10/12] fix travis.ym;l

---
 scripts/libpostal/1.1-alpha/.travis.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/libpostal/1.1-alpha/.travis.yml b/scripts/libpostal/1.1-alpha/.travis.yml
index 931a05d57..0b3c620eb 100644
--- a/scripts/libpostal/1.1-alpha/.travis.yml
+++ b/scripts/libpostal/1.1-alpha/.travis.yml
@@ -14,9 +14,14 @@ matrix:
           packages:
            - libstdc++-4.8-dev
            - pandoc
+           - curl
+           - autoconf
+           - automake
+           - libtool
+           - pkgconfig
 
 script:
-- if [[ $(uname -s) == 'Darwin' ]]; then brew install pandoc || true; fi;
+- if [[ $(uname -s) == 'Darwin' ]]; then brew install curl autoconf automake libtool pkg-config || true; fi;
 - ./mason build ${MASON_NAME} ${MASON_VERSION}
-- nm $(./mason prefix ${MASON_NAME} ${MASON_VERSION})/bin/osmium | grep "GLIBC" | c++filt  || true
+- nm $(./mason prefix ${MASON_NAME} ${MASON_VERSION})/bin/libpostal | grep "GLIBC" | c++filt  || true
 - ./mason publish ${MASON_NAME} ${MASON_VERSION}
\ No newline at end of file

From 9044fe6636c2c56ee5850758ec54b5530351fdf7 Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Thu, 23 Jul 2020 16:15:38 -0400
Subject: [PATCH 11/12] cleanup and add comments

---
 scripts/libpostal/1.1-alpha/script.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
index c375c339f..0b18c913f 100644
--- a/scripts/libpostal/1.1-alpha/script.sh
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -25,6 +25,9 @@ function mason_prepare_compile {
     ${MASON_DIR}/mason install cmake 3.15.2
     ${MASON_DIR}/mason link cmake 3.15.2
 
+    ./bootstrap.sh
+    ./configure --datadir=$MASON_ROOT/libpostal-data/
+
 }
 
 function mason_compile {
@@ -33,6 +36,8 @@ function mason_compile {
     echo "mason root : " $MASON_ROOT
     echo "mason cache : " $MASON_CCACHE
 
+    # installation instructions from https://github.com/openvenues/libpostal
+
     CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
     ${MASON_ROOT}/.link/bin/cmake \
         -DCMAKE_INSTALL_PREFIX=${MASON_PREFIX} \
@@ -47,7 +52,12 @@ function mason_compile {
     else
         make VERBOSE=1 -j${MASON_CONCURRENCY}
     fi
+
     make install
+
+    if [[ $(uname -s) != 'Darwin' ]]; then
+        ldconfig
+    fi
 }
 
 function mason_cflags {

From 2f86efba4e3f5c0072bbe800fac1cb9a3c8ad599 Mon Sep 17 00:00:00 2001
From: manoharuss <manohar@mapbox.com>
Date: Thu, 23 Jul 2020 16:44:30 -0400
Subject: [PATCH 12/12] cleanup and working local build

---
 scripts/libpostal/1.1-alpha/.travis.yml |  6 ----
 scripts/libpostal/1.1-alpha/script.sh   | 39 +++++++++----------------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/scripts/libpostal/1.1-alpha/.travis.yml b/scripts/libpostal/1.1-alpha/.travis.yml
index 0b3c620eb..3e057457c 100644
--- a/scripts/libpostal/1.1-alpha/.travis.yml
+++ b/scripts/libpostal/1.1-alpha/.travis.yml
@@ -14,14 +14,8 @@ matrix:
           packages:
            - libstdc++-4.8-dev
            - pandoc
-           - curl
-           - autoconf
-           - automake
-           - libtool
-           - pkgconfig
 
 script:
-- if [[ $(uname -s) == 'Darwin' ]]; then brew install curl autoconf automake libtool pkg-config || true; fi;
 - ./mason build ${MASON_NAME} ${MASON_VERSION}
 - nm $(./mason prefix ${MASON_NAME} ${MASON_VERSION})/bin/libpostal | grep "GLIBC" | c++filt  || true
 - ./mason publish ${MASON_NAME} ${MASON_VERSION}
\ No newline at end of file
diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh
index 0b18c913f..9cf7100cb 100644
--- a/scripts/libpostal/1.1-alpha/script.sh
+++ b/scripts/libpostal/1.1-alpha/script.sh
@@ -17,36 +17,23 @@ function mason_load_source {
 }
 
 function mason_prepare_compile {
-    CCACHE_VERSION=3.3.4
-    ${MASON_DIR}/mason install ccache ${CCACHE_VERSION}
-    MASON_CCACHE=$(${MASON_DIR}/mason prefix ccache ${CCACHE_VERSION})
-    ${MASON_DIR}/mason install cmake 3.15.2
-    MASON_CCACHE=$(${MASON_DIR}/mason prefix ccache ${CCACHE_VERSION})
-    ${MASON_DIR}/mason install cmake 3.15.2
-    ${MASON_DIR}/mason link cmake 3.15.2
 
-    ./bootstrap.sh
-    ./configure --datadir=$MASON_ROOT/libpostal-data/
+    # installation instructions from https://github.com/openvenues/libpostal
+
+    if [[ $(uname -s) == 'Linux' ]]
+    then
+        yum install curl autoconf automake libtool pkgconfig
+    elif [[ $(uname -s) == 'Darwin' ]]
+    then
+        brew install curl autoconf automake libtool pkg-config
+    fi
 
 }
 
 function mason_compile {
-    echo "LOG"
-    echo "mason prefix : " $MASON_PREFIX
-    echo "mason root : " $MASON_ROOT
-    echo "mason cache : " $MASON_CCACHE
-
-    # installation instructions from https://github.com/openvenues/libpostal
+    ./bootstrap.sh
+    ./configure --datadir=${MASON_ROOT}/libpostal-data/
 
-    CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
-    ${MASON_ROOT}/.link/bin/cmake \
-        -DCMAKE_INSTALL_PREFIX=${MASON_PREFIX} \
-        -DCMAKE_CXX_COMPILER_LAUNCHER="${MASON_CCACHE}/bin/ccache" \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DBoost_NO_SYSTEM_PATHS=ON \
-        -DBoost_USE_STATIC_LIBS=ON \
-        ..
-    # limit concurrency on travis to avoid heavy jobs being killed
     if [[ ${TRAVIS_OS_NAME:-} ]]; then
         make VERBOSE=1 -j4
     else
@@ -55,9 +42,11 @@ function mason_compile {
 
     make install
 
-    if [[ $(uname -s) != 'Darwin' ]]; then
+    if [[ $(uname -s) == 'Linux' ]]
+    then
         ldconfig
     fi
+
 }
 
 function mason_cflags {