experiments
/
STT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2313 from lissyx/static-libsox 

Statically link libsox
This commit is contained in:
lissyx 2019-08-21 22:53:18 +02:00 committed by GitHub
parent 1ec34190a8 8534c0f93a
commit d5544b4a15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -31,7 +31,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
liblzma-dev \ liblzma-dev \
locales \ locales \
pkg-config \ pkg-config \
libpng-dev \
libsox-dev \ libsox-dev \
libmagic-dev \
libgsm1-dev \
libltdl-dev \
openjdk-8-jdk \ openjdk-8-jdk \
bash-completion \ bash-completion \
g++ \ g++ \

5
native_client/definitions.mk
View File

@ -22,7 +22,12 @@ CFLAGS :=
CXXFLAGS := CXXFLAGS :=
LDFLAGS := LDFLAGS :=
SOX_CFLAGS := `pkg-config --cflags sox` 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` SOX_LDFLAGS := `pkg-config --libs sox`
endif # OS others
PYTHON_PACKAGES := numpy${NUMPY_BUILD_VERSION} PYTHON_PACKAGES := numpy${NUMPY_BUILD_VERSION}
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
PYTHON_PLATFORM_NAME := --plat-name manylinux1_x86_64 PYTHON_PLATFORM_NAME := --plat-name manylinux1_x86_64

2
taskcluster/.shared.yml
View File

@ -1,6 +1,6 @@
python: python:
packages_trusty: 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: 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' 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: packages_buster: