From 8534c0f93ac7e848ae7ffcf41d24f5ed9fb36920 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Wed, 21 Aug 2019 10:02:56 +0200 Subject: [PATCH] Statically link libsox --- Dockerfile | 4 ++++ native_client/definitions.mk | 5 +++++ taskcluster/.shared.yml | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f91dc42a..9b37a566 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ liblzma-dev \ locales \ pkg-config \ + libpng-dev \ libsox-dev \ + libmagic-dev \ + libgsm1-dev \ + libltdl-dev \ openjdk-8-jdk \ bash-completion \ g++ \ diff --git a/native_client/definitions.mk b/native_client/definitions.mk index 941e4a49..eb0d6611 100644 --- a/native_client/definitions.mk +++ b/native_client/definitions.mk @@ -22,7 +22,12 @@ CFLAGS := CXXFLAGS := LDFLAGS := SOX_CFLAGS := `pkg-config --cflags sox` +ifeq ($(OS),Linux) +SOX_CFLAGS += -fopenmp +SOX_LDFLAGS := -Wl,-Bstatic `pkg-config --static --libs sox` -lgsm `pkg-config --static --libs libpng | cut -d' ' -f1` -lz -lmagic -lltdl -Wl,-Bdynamic -ldl +else # OS == Linux SOX_LDFLAGS := `pkg-config --libs sox` +endif # OS others PYTHON_PACKAGES := numpy${NUMPY_BUILD_VERSION} ifeq ($(OS),Linux) PYTHON_PLATFORM_NAME := --plat-name manylinux1_x86_64 diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml index e85124ba..d8d5c662 100644 --- a/taskcluster/.shared.yml +++ b/taskcluster/.shared.yml @@ -1,6 +1,6 @@ python: packages_trusty: - apt: 'make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev liblzma-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev' + apt: 'make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev liblzma-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libpng-dev libsox-dev libmagic-dev libgsm1-dev libltdl-dev' packages_stretch: apt: 'make build-essential libssl1.0-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev' packages_buster: