Merge pull request #2 from dforsber/use-libs-from-os-packages

Use libs from os packages
This commit is contained in:
Dan Forsberg 2020-10-27 15:07:25 +00:00 committed by GitHub
commit 2c8af051b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions

View File

@ -6,7 +6,7 @@ SQLITE:=$(ROOT)/sqlite
# Flags # Flags
CXX = g++ CXX = g++
OPTIMIZATIONS = -O3 OPTIMIZATIONS = -O3
CFLAGS = -I $(SQLITE) $(OPTIMIZATIONS) -std=c++11 -Wall -fPIC -g CFLAGS = $CFLAGS -I $(SQLITE) $(OPTIMIZATIONS) -std=c++11 -Wall -fPIC -g
LIBS = -lparquet -lboost_regex -lboost_system -lboost_filesystem \ LIBS = -lparquet -lboost_regex -lboost_system -lboost_filesystem \
-lbrotlienc -lbrotlicommon -lbrotlidec -licui18n -licuuc -licudata \ -lbrotlienc -lbrotlicommon -lbrotlidec -licui18n -licuuc -licudata \
-llz4 -lsnappy -lthrift -lz -lzstd -lcrypto -lssl -llz4 -lsnappy -lthrift -lz -lzstd -lcrypto -lssl

View File

@ -5,7 +5,7 @@ apt install -y sudo lsb-release wget
here=$(dirname "${BASH_SOURCE[0]}") here=$(dirname "${BASH_SOURCE[0]}")
here=$(readlink -f "$here") here=$(readlink -f "$here")
ubuntu="$(lsb_release -s -r)" distro="$(lsb_release -s -r)"
setup_directories() { setup_directories() {
cd "$here" cd "$here"
@ -14,14 +14,24 @@ setup_directories() {
cd build/linux cd build/linux
} }
install_prerequisites() { install_prerequisites_amazon_linux() {
# Install Apache Arrow <https://arrow.apache.org/install/> and dependencies.
sudo yum update -y
sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
sudo yum install -y https://apache.bintray.com/arrow/centos/7/apache-arrow-release-latest.rpm
sudo yum install -y --enablerepo=epel parquet-devel
sudo yum install -y lz4-devel thrift-devel libzstd-devel snappy-devel brotli-devel boost-devel boost-static libicu-devel openssl-devel
export CFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
}
install_prerequisites_ubuntu() {
# install Apache Arrow libs # install Apache Arrow libs
# NOTE: Pinned to Ubuntu Focal # NOTE: Pinned to Ubuntu Focal
wget https://apache.bintray.com/arrow/ubuntu/apache-arrow-archive-keyring-latest-focal.deb wget https://apache.bintray.com/arrow/ubuntu/apache-arrow-archive-keyring-latest-focal.deb
sudo apt install -y -V ./apache-arrow-archive-keyring-latest-focal.deb sudo apt install -y -V ./apache-arrow-archive-keyring-latest-focal.deb
sudo apt update -y sudo apt update -y
sudo apt install -y -V libparquet-dev liblz4-dev libzstd-dev libthrift-dev \ sudo apt install -y -V libparquet-dev liblz4-dev libzstd-dev libthrift-dev \
libsnappy-dev libthrift-dev libbrotli-dev libz-dev libsnappy-dev libbrotli-dev libz-dev
# Install prereqs based on https://github.com/apache/parquet-cpp#linux # Install prereqs based on https://github.com/apache/parquet-cpp#linux
sudo apt install -y libboost-dev g++ libboost-filesystem-dev \ sudo apt install -y libboost-dev g++ libboost-filesystem-dev \
@ -43,7 +53,7 @@ build_sqlite() {
} }
set_icu_version() { set_icu_version() {
case "$ubuntu" in case "$distro" in
14.04) 14.04)
export ICU_VERSION=52-1 export ICU_VERSION=52-1
;; ;;