From 4ab455b647c16a35d13f526c398417d08ea25352 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 3 Sep 2020 15:26:46 -0700 Subject: [PATCH 1/6] fixes to libpostal packaging --- scripts/libpostal/1.1-alpha/.travis.yml | 4 ++++ scripts/libpostal/1.1-alpha/script.sh | 29 ++----------------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/scripts/libpostal/1.1-alpha/.travis.yml b/scripts/libpostal/1.1-alpha/.travis.yml index 3e057457c..a0fadb77c 100644 --- a/scripts/libpostal/1.1-alpha/.travis.yml +++ b/scripts/libpostal/1.1-alpha/.travis.yml @@ -14,6 +14,10 @@ matrix: packages: - libstdc++-4.8-dev - pandoc + - autoconf + - automake + - libtool + - pkgconfig script: - ./mason build ${MASON_NAME} ${MASON_VERSION} diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh index 9cf7100cb..a1412aa0d 100644 --- a/scripts/libpostal/1.1-alpha/script.sh +++ b/scripts/libpostal/1.1-alpha/script.sh @@ -16,37 +16,12 @@ function mason_load_source { export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION} } -function mason_prepare_compile { - - # 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 { ./bootstrap.sh - ./configure --datadir=${MASON_ROOT}/libpostal-data/ - - if [[ ${TRAVIS_OS_NAME:-} ]]; then - make VERBOSE=1 -j4 - else - make VERBOSE=1 -j${MASON_CONCURRENCY} - fi - + ./configure --datadir=/tmp/ + make VERBOSE=1 -j${MASON_CONCURRENCY} make install - if [[ $(uname -s) == 'Linux' ]] - then - ldconfig - fi - } function mason_cflags { From 37402989e63573937be129b6210c9424940de8a9 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 3 Sep 2020 15:33:38 -0700 Subject: [PATCH 2/6] fix package name --- scripts/libpostal/1.1-alpha/.travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libpostal/1.1-alpha/.travis.yml b/scripts/libpostal/1.1-alpha/.travis.yml index a0fadb77c..24f58031a 100644 --- a/scripts/libpostal/1.1-alpha/.travis.yml +++ b/scripts/libpostal/1.1-alpha/.travis.yml @@ -17,7 +17,7 @@ matrix: - autoconf - automake - libtool - - pkgconfig + - pkg-config script: - ./mason build ${MASON_NAME} ${MASON_VERSION} From 580fa3c53ef6486693fad66495cb5be57538d186 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 3 Sep 2020 15:46:50 -0700 Subject: [PATCH 3/6] install into correct prefix --- scripts/libpostal/1.1-alpha/.travis.yml | 1 - scripts/libpostal/1.1-alpha/script.sh | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/libpostal/1.1-alpha/.travis.yml b/scripts/libpostal/1.1-alpha/.travis.yml index 24f58031a..aae9aa944 100644 --- a/scripts/libpostal/1.1-alpha/.travis.yml +++ b/scripts/libpostal/1.1-alpha/.travis.yml @@ -21,5 +21,4 @@ matrix: script: - ./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 a1412aa0d..6a7179491 100644 --- a/scripts/libpostal/1.1-alpha/script.sh +++ b/scripts/libpostal/1.1-alpha/script.sh @@ -18,10 +18,9 @@ function mason_load_source { function mason_compile { ./bootstrap.sh - ./configure --datadir=/tmp/ + ./configure ${MASON_HOST_ARG} --datadir=/tmp/ --prefix=${MASON_PREFIX} make VERBOSE=1 -j${MASON_CONCURRENCY} make install - } function mason_cflags { From 2d49c12dfa63e428b98b466152054dd4fb2e9710 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 3 Sep 2020 15:57:44 -0700 Subject: [PATCH 4/6] fix bin name --- 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 6a7179491..02dd673d6 100644 --- a/scripts/libpostal/1.1-alpha/script.sh +++ b/scripts/libpostal/1.1-alpha/script.sh @@ -2,7 +2,7 @@ MASON_NAME=libpostal MASON_VERSION=1.1-alpha -MASON_LIB_FILE=bin/libpostal +MASON_LIB_FILE=bin/libpostal_data . ${MASON_DIR}/mason.sh From bb3c3a6ab81ea9a2ee9b1f4e21935b727ccbb33b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 3 Sep 2020 15:58:28 -0700 Subject: [PATCH 5/6] upgrade xcode --- scripts/libpostal/1.1-alpha/.travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libpostal/1.1-alpha/.travis.yml b/scripts/libpostal/1.1-alpha/.travis.yml index aae9aa944..47f654a19 100644 --- a/scripts/libpostal/1.1-alpha/.travis.yml +++ b/scripts/libpostal/1.1-alpha/.travis.yml @@ -3,7 +3,7 @@ language: generic matrix: include: - os: osx - osx_image: xcode8 + osx_image: xcode11 compiler: clang - os: linux sudo: false From eb9cbd803f2e23cc983133d1195238235edb2a8d Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 3 Sep 2020 16:22:43 -0700 Subject: [PATCH 6/6] attempt to fix the install on osx --- scripts/libpostal/1.1-alpha/script.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/libpostal/1.1-alpha/script.sh b/scripts/libpostal/1.1-alpha/script.sh index 02dd673d6..5959919cd 100644 --- a/scripts/libpostal/1.1-alpha/script.sh +++ b/scripts/libpostal/1.1-alpha/script.sh @@ -18,9 +18,12 @@ function mason_load_source { function mason_compile { ./bootstrap.sh - ./configure ${MASON_HOST_ARG} --datadir=/tmp/ --prefix=${MASON_PREFIX} + ./configure ${MASON_HOST_ARG} --datadir=${MASON_ROOT}/data --prefix=${MASON_PREFIX} make VERBOSE=1 -j${MASON_CONCURRENCY} make install + cp src/libpostal ${MASON_PREFIX}/bin/ + cp src/address_parser ${MASON_PREFIX}/bin/ + cp src/language_classifier ${MASON_PREFIX}/bin/ } function mason_cflags {