[vlc-commits] contribs: libtasn1: 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 16:48:40 2018 +0100| [06fecd458e497bbe11a59c5ef11507686e0e7943] | committer: Hugo Beauzée-Luyssen

contribs: libtasn1: Don't build executables

Which deprecates previous patch

(cherry picked from commit ae7d45aeb76bac457fd593abb465046a2902cd6a)
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=06fecd458e497bbe11a59c5ef11507686e0e7943
---

 contrib/src/libtasn1/no-benchmark.patch   | 39 -------------------------------
 contrib/src/libtasn1/no-executables.patch | 11 +++++++++
 contrib/src/libtasn1/rules.mak            |  5 ++--
 3 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/contrib/src/libtasn1/no-benchmark.patch b/contrib/src/libtasn1/no-benchmark.patch
deleted file mode 100644
index 18d8e8419d..0000000000
--- a/contrib/src/libtasn1/no-benchmark.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- libtasn1/src/benchmark.c.orig	2016-05-06 14:37:46.748895833 +0200
-+++ libtasn1/src/benchmark.c	2016-05-06 14:38:16.620222564 +0200
-@@ -91,25 +91,6 @@
-   benchmark_must_finish = 0;
- 
- #if defined _WIN32
--  st->wtimer = CreateWaitableTimer (NULL, TRUE, NULL);
--  if (st->wtimer == NULL)
--    {
--      fprintf (stderr, "error: CreateWaitableTimer %u\n", GetLastError ());
--      exit (1);
--    }
--  st->wthread = CreateThread (NULL, 0, alarm_handler, &st->wtimer, 0, NULL);
--  if (st->wthread == NULL)
--    {
--      fprintf (stderr, "error: CreateThread %u\n", GetLastError ());
--      exit (1);
--    }
--  st->alarm_timeout.QuadPart = (5) * 10000000;
--  if (SetWaitableTimer (st->wtimer, &st->alarm_timeout, 0, NULL, NULL, FALSE)
--      == 0)
--    {
--      fprintf (stderr, "error: SetWaitableTimer %u\n", GetLastError ());
--      exit (1);
--    }
- #else
-   alarm (5);
- #endif
-@@ -127,10 +108,6 @@
-   char imetric[16];
- 
- #if defined _WIN32
--  if (st->wtimer != NULL)
--    CloseHandle (st->wtimer);
--  if (st->wthread != NULL)
--    CloseHandle (st->wthread);
- #else
-   signal (SIGALRM, st->old_handler);
- #endif
diff --git a/contrib/src/libtasn1/no-executables.patch b/contrib/src/libtasn1/no-executables.patch
new file mode 100644
index 0000000000..e900594019
--- /dev/null
+++ b/contrib/src/libtasn1/no-executables.patch
@@ -0,0 +1,11 @@
+--- libtasn1/src/Makefile.am.old	2018-11-20 16:44:09.003920133 +0100
++++ libtasn1/src/Makefile.am	2018-11-20 16:42:16.591920562 +0100
+@@ -21,7 +21,7 @@
+ 
+ LDADD = ../lib/libtasn1.la ../gl/libgnu.la
+ 
+-bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding
++EXTRA_PROGRAMS = asn1Parser asn1Coding asn1Decoding
+ 
+ asn1Parser_SOURCES = asn1Parser.c
+ 
diff --git a/contrib/src/libtasn1/rules.mak b/contrib/src/libtasn1/rules.mak
index 219d837b3c..97d12d5aa2 100644
--- a/contrib/src/libtasn1/rules.mak
+++ b/contrib/src/libtasn1/rules.mak
@@ -14,12 +14,11 @@ $(TARBALLS)/libtasn1-$(LIBTASN1_VERSION).tar.gz:
 
 libtasn1: libtasn1-$(LIBTASN1_VERSION).tar.gz .sum-libtasn1
 	$(UNPACK)
-ifdef HAVE_WINSTORE
-	$(APPLY) $(SRC)/libtasn1/no-benchmark.patch
-endif
+	$(APPLY) $(SRC)/libtasn1/no-executables.patch
 	$(MOVE)
 
 .libtasn1: libtasn1
+	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-doc
 	cd $< && $(MAKE) install
 	touch $@