Skip to content

Commit

Permalink
gnutls: build fix for conflicting gettext() declaration/definition
Browse files Browse the repository at this point in the history
The symptom is:

	src/benchmark.h:38:20: error: static declaration of 'gettime' follows non-static declaration
	inline static void gettime(struct timespec *ts)
			   ^
	src/gl/timespec.h:93:6: note: previous declaration is here
	void gettime (struct timespec *) _GL_ARG_NONNULL ((1));
	     ^

This only affects the clang build, not the gcc build. This fix is a GNU
TLS patch, backported to MSYS2, then borrowed from
msys2#18258.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
lazka authored and dscho committed Sep 8, 2023
1 parent 4f8381e commit e1acdbf
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions mingw-w64-gnutls/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v${_pkgver%.*}/${_realname}-${pkgver}.tar.xz{,.sig}
0003-gnutls-fix-external-libtasn1-detection.patch
0004-disable-broken-examples.patch
0005-remove-coverage-rules.patch)
0005-remove-coverage-rules.patch
https://gitlab.com/gnutls/gnutls/-/merge_requests/1770.patch)
sha256sums=('ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c'
'SKIP'
'6493f69e782d60fe04de4b0040987e99851c522d0baf2fe25d10b85b63e97863'
'cbf9e59fb2432d4ac1edcb70734023e074b8058fa4c010a036a40de8449f67fb'
'10ea5a84459af8d848788cc8871decd3b3cdd542b829883ebe4f6ec28d60578f')
'10ea5a84459af8d848788cc8871decd3b3cdd542b829883ebe4f6ec28d60578f'
'b12b3f987389518dbd65c82b41c99bf50ac5a7dcee74ef96f7076dce1d351f52')
validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F') # "Simon Josefsson <simon@josefsson.org>"
validpgpkeys+=('1F42418905D8206AA754CCDC29EE58B996865171') # "Nikos Mavrogiannopoulos <nmav@gnutls.org>
validpgpkeys+=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@unixuser.org>"
Expand All @@ -47,6 +49,7 @@ prepare() {
patch -p1 -i ${srcdir}/0003-gnutls-fix-external-libtasn1-detection.patch
patch -p1 -i ${srcdir}/0004-disable-broken-examples.patch
patch -p1 -i ${srcdir}/0005-remove-coverage-rules.patch
patch -p1 -i ${srcdir}/1770.patch

WANT_AUTOMAKE=latest autoreconf -fiv -I m4
}
Expand Down

0 comments on commit e1acdbf

Please sign in to comment.