Commit ae7d45ae authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

contribs: libtasn1: Don't build executables

Which deprecates previous patch
parent 5750f753
--- 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
--- 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
......@@ -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 $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment