From 3d7bb83b110f51d4f4b005dadbce25c977a54bd4 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 3 Jan 2017 19:27:14 -0500 Subject: [PATCH] libx265: Disable assembly on x86 to avoid relocs --- disabled-packages/libx265/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/disabled-packages/libx265/build.sh b/disabled-packages/libx265/build.sh index bf2e87206..ac7f7abbb 100644 --- a/disabled-packages/libx265/build.sh +++ b/disabled-packages/libx265/build.sh @@ -6,6 +6,12 @@ TERMUX_PKG_FOLDERNAME=x265_$TERMUX_PKG_VERSION termux_step_configure () { cd $TERMUX_PKG_BUILDDIR + + CMAKE_EXTRA_OPTS="" + if [ $TERMUX_ARCH = "i686" ]; then + CMAKE_EXTRA_OPTS="-DENABLE_ASSEMBLY=OFF" + fi + cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR/source \ -DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \ -DCMAKE_BUILD_TYPE=MinSizeRel \ @@ -20,5 +26,6 @@ termux_step_configure () { -DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \ -DCMAKE_MAKE_PROGRAM=`which make` \ -DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \ - -DCMAKE_SYSTEM_NAME=Android + -DCMAKE_SYSTEM_NAME=Android \ + $CMAKE_EXTRA_OPTS }