[vlc-commits] contribs: jpeg: Don't build executables

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Nov 20 15:13:56 2018 +0100| [9b8a8045664b6f9bb0ad52bcccef17eb5de09107] | committer: Hugo Beauzée-Luyssen

contribs: jpeg: Don't build executables

(cherry picked from commit 5750f753cf8128fd6d1fd4eda9f505f4c68dfc15)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 contrib/src/jpeg/no_executables.patch | 11 +++++++++++
 contrib/src/jpeg/rules.mak            |  1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/jpeg/no_executables.patch b/contrib/src/jpeg/no_executables.patch
new file mode 100644
index 0000000000..6465ab1d5d
--- /dev/null
+++ b/contrib/src/jpeg/no_executables.patch
@@ -0,0 +1,11 @@
+--- jpeg/Makefile.am.old	2018-11-20 16:49:53.187918820 +0100
++++ jpeg/Makefile.am	2018-11-20 16:49:55.179918813 +0100
+@@ -76,7 +76,7 @@
+ endif
+ 
+ # Executables to build
+-bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
++EXTRA_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
+ 
+ # Executable sources & libs
+ cjpeg_SOURCES    = cjpeg.c rdppm.c rdgif.c rdtarga.c rdrle.c rdbmp.c \
diff --git a/contrib/src/jpeg/rules.mak b/contrib/src/jpeg/rules.mak
index f57eed1828..2f20437c62 100644
--- a/contrib/src/jpeg/rules.mak
+++ b/contrib/src/jpeg/rules.mak
@@ -11,6 +11,7 @@ $(TARBALLS)/jpegsrc.v$(JPEG_VERSION).tar.gz:
 jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg
 	$(UNPACK)
 	mv jpeg-$(JPEG_VERSION) jpegsrc.v$(JPEG_VERSION)
+	$(APPLY) $(SRC)/jpeg/no_executables.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)