[vlc-commits] [Git][videolan/vlc][master] contrib: libtasn1: avoid reconfiguration

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
5350d68a by Steve Lhomme at 2022-11-29T16:51:53+00:00
contrib: libtasn1: avoid reconfiguration

The gnulib packaged doesn't seem to match the source (wint_t detection
differences). We can just force EXTRA_PROGRAMS to avoid building the
executables.

The strverscmp() patch doesn't seem necessary anymore.

- - - - -


2 changed files:

- − contrib/src/libtasn1/no-executables.patch
- contrib/src/libtasn1/rules.mak


Changes:

=====================================
contrib/src/libtasn1/no-executables.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- 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
- 


=====================================
contrib/src/libtasn1/rules.mak
=====================================
@@ -14,18 +14,14 @@ $(TARBALLS)/libtasn1-$(LIBTASN1_VERSION).tar.gz:
 
 libtasn1: libtasn1-$(LIBTASN1_VERSION).tar.gz .sum-libtasn1
 	$(UNPACK)
-	$(APPLY) $(SRC)/libtasn1/no-executables.patch
 	$(APPLY) $(SRC)/libtasn1/0001-fcntl-do-not-call-GetHandleInformation-in-Winstore-a.patch
-	# on iOS for some reason _GNU_SOURCE is found in config.h but strverscmp() is not found
-	sed -i.orig -e 's, -DASN1_BUILDING, -DASN1_BUILDING -D_GNU_SOURCE,' $(UNPACK_DIR)/lib/Makefile.am
 	$(MOVE)
 
 LIBTASN1_CONF := --disable-doc
 
 .libtasn1: libtasn1
-	$(RECONF)
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(LIBTASN1_CONF)
-	+$(MAKEBUILD)
-	+$(MAKEBUILD) install
+	+$(MAKEBUILD) bin_PROGRAMS=
+	+$(MAKEBUILD) bin_PROGRAMS= install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5350d68ae505266f60b15eabcd7aec5b86eeffda

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5350d68ae505266f60b15eabcd7aec5b86eeffda
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance