[vlc-devel] [PATCH] contrib: gnutls: remove unsued patch on ANDROID

[Alexandre Janniaux]

Hi,

LGTM, but you could mention that it's a partial revert of
bead358b379601eb4be6d9914bd3379ff73b50ba for future commit
readers. ;)

Regards,
--
Alexandre Janniaux
Videolabs

On Fri, Sep 04, 2020 at 10:06:43AM +0200, Thomas Guillem wrote:
> The Makefile.am modification caused a reconf that could fail with recent
> automake version (>= 1.16.2).
> ---
>  contrib/src/gnutls/no-create-time-h.patch | 11 -----------
>  contrib/src/gnutls/rules.mak              |  3 ---
>  2 files changed, 14 deletions(-)
>  delete mode 100644 contrib/src/gnutls/no-create-time-h.patch
>
> diff --git a/contrib/src/gnutls/no-create-time-h.patch b/contrib/src/gnutls/no-create-time-h.patch
> deleted file mode 100644
> index d355c7cc6b3..00000000000
> --- a/contrib/src/gnutls/no-create-time-h.patch
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- gnutls/gl/Makefile.am	2011-04-07 17:30:44.000000000 -0700
> -+++ gnutls/gl/Makefile.am	2012-03-02 19:51:53.576555217 -0800
> -@@ -891,7 +891,7 @@ EXTRA_DIST += sys_stat.in.h
> -
> - ## begin gnulib module time
> -
> --BUILT_SOURCES += time.h
> -+#BUILT_SOURCES += time.h
> -
> - # We need the following in order to create <time.h> when the system
> - # doesn't have one that works with the given compiler.
> diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
> index 96a5613a660..98678da8300 100644
> --- a/contrib/src/gnutls/rules.mak
> +++ b/contrib/src/gnutls/rules.mak
> @@ -36,9 +36,6 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
>
>  	# don't use connectx on macOS versions where it's not available
>  	$(APPLY) $(SRC)/gnutls/0001-fix-connectx-not-available-on-older-macOS-SDK.patch
> -ifdef HAVE_ANDROID
> -	$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
> -endif
>  	$(call pkg_static,"lib/gnutls.pc.in")
>  	$(UPDATE_AUTOCONFIG)
>  	$(MOVE)
> --
> 2.28.0
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel