main/libgpg-error: build fix for armhf and aarch64

fixes compile failure:
logging.c: In function '_gpgrt_log_printhex':
logging.c:1153:49: error: incompatible type for argument 4 of '_gpgrt_logv_printhex'
     _gpgrt_logv_printhex (buffer, length, NULL, NULL);
                                                 ^~~~
logging.c:1097:1: note: expected 'va_list {aka __va_list}' but argument is of type 'void *'
 _gpgrt_logv_printhex (const void *buffer, size_t length,
 ^~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Natanael Copa 2018-03-16 11:00:39 +00:00
parent f5bcb24db9
commit 29db8fdc62
2 changed files with 25 additions and 2 deletions

View File

@ -13,7 +13,7 @@ makedepends=""
install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-lisp:lisp:noarch"
source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
"
fix-va_list.patch"
builddir="$srcdir"/$pkgname-$pkgver
build () {
cd "$builddir"
@ -42,4 +42,5 @@ lisp() {
mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/
}
sha512sums="967e5e9930ca2bcd4cc790d69c907684500120c1363ed384a5540ccd4e9a387977c7352da03ff7e0feeacedf073131fc0db9eea9d097d0fbd389fd0bc9b5c209 libgpg-error-1.28.tar.bz2"
sha512sums="967e5e9930ca2bcd4cc790d69c907684500120c1363ed384a5540ccd4e9a387977c7352da03ff7e0feeacedf073131fc0db9eea9d097d0fbd389fd0bc9b5c209 libgpg-error-1.28.tar.bz2
36b8d9248fe4ce8efc6dc046f3b0e658f54e95fdd21afa1b262c2b87acbddcc46f68ccd475d761038e38f2991903f51ebe2c13bd9351fa650cfa2f08c2235429 fix-va_list.patch"

View File

@ -0,0 +1,22 @@
diff --git a/src/logging.c b/src/logging.c
index 1a4f620..12b9494 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -1141,7 +1141,7 @@ void
_gpgrt_log_printhex (const void *buffer, size_t length,
const char *fmt, ...)
{
- va_list arg_ptr;
+ va_list arg_ptr = {};
if (fmt)
{
@@ -1150,7 +1150,7 @@ _gpgrt_log_printhex (const void *buffer, size_t length,
va_end (arg_ptr);
}
else
- _gpgrt_logv_printhex (buffer, length, NULL, NULL);
+ _gpgrt_logv_printhex (buffer, length, NULL, arg_ptr);
}