[vlc-commits] contrib: x265: Skip building the CLI binaries altogether

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Mon Feb 26 13:09:09 2018 +0200| [75843515b1a7b1e0225daae967c2d84fc7b5470c] | committer: Jean-Baptiste Kempf

contrib: x265: Skip building the CLI binaries altogether

This reverts 696cb02d7bbd491cdc8a2df29b53d48f391b59c5 and solves
the issue differently, by simply not trying to build the
problematic parts which aren't needed for VLC anyway.

(cherry picked from commit 3a9ef4076773ce9b878ba35d2d3f25d1175a7583)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=75843515b1a7b1e0225daae967c2d84fc7b5470c
---

 contrib/src/x265/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index 95b797333a..9a0aa39ee2 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -35,7 +35,7 @@ endif
 
 .x265: x265 toolchain.cmake
 	$(REQUIRE_GPL)
-	cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH)
+	cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) -DENABLE_CLI=OFF
 	cd $</source && $(MAKE) install
 	sed -e s/'[^ ]*clang_rt[^ ]*'//g -i.orig "$(PREFIX)/lib/pkgconfig/x265.pc"
 	touch $@