From faf9dd7ca17f4b1b6553c1de1e384a5a189395cf Mon Sep 17 00:00:00 2001 From: Tom Yan Date: Mon, 14 Dec 2020 21:25:51 +0800 Subject: [PATCH] sox: build with omp again --- packages/sox/build.sh | 3 +-- scripts/build/termux_step_setup_toolchain.sh | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/sox/build.sh b/packages/sox/build.sh index 6945db62b..c72a431e2 100644 --- a/packages/sox/build.sh +++ b/packages/sox/build.sh @@ -2,13 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://sox.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Command line utility for converting between and applying effects to various audio files formats" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_VERSION=14.4.2 -TERMUX_PKG_REVISION=19 +TERMUX_PKG_REVISION=20 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/sox/sox/${TERMUX_PKG_VERSION}/sox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c TERMUX_PKG_DEPENDS="file, libao, libpng, libmp3lame, libvorbis, libandroid-glob, libflac, libid3tag, libmad, pulseaudio, opusfile, libsndfile, zlib" TERMUX_PKG_BREAKS="sox-dev" TERMUX_PKG_REPLACES="sox-dev" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-openmp" termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index 3147a864d..4612f039f 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -53,6 +53,11 @@ termux_step_setup_toolchain() { termux_error_exit "Invalid arch '$TERMUX_ARCH' - support arches are 'arm', 'i686', 'aarch64', 'x86_64'" fi + # -static-openmp requires -fopenmp in LDFLAGS to work; hopefully this won't be problematic + # even when we don't have -fopenmp in CFLAGS / when we don't want to enable OpenMP + # We might also want to consider shipping libomp.so instead; since r21 + LDFLAGS+=" -fopenmp -static-openmp" + # Android 7 started to support DT_RUNPATH (but not DT_RPATH). LDFLAGS+=" -Wl,--enable-new-dtags"