[PR PATCH] gpgme: more generic template + fix on 32-bit ppc glibc

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/void-ppc/void-packages gpgme
https://github.com/void-linux/void-packages/pull/15295

gpgme: more generic template + fix on 32-bit ppc glibc


A patch file from https://github.com/void-linux/void-packages/pull/15295.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpgme-15295.patch --]
[-- Type: text/x-diff, Size: 1198 bytes --]

From c8c846d0bdb892eb04561c60407399db9bacd828 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 10 Oct 2019 17:42:12 +0200
Subject: [PATCH] gpgme: more generic template + fix on 32-bit ppc glibc

[ci skip]
---
 srcpkgs/gpgme/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 3492b8c29f6..cbc08afe773 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -16,13 +16,13 @@ homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
 checksum=c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" ac_cv_sys_file_offset_bits=no";;
-	i686*|arm*)
-		CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-		CXXFLAGS="${CFLAGS}"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" ac_cv_sys_file_offset_bits=no"
+elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
+	CXXFLAGS="${CFLAGS}"
+fi
+
 CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
 
 post_extract() {