summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-12-21 09:55:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-22 23:05:50 +0000
commit663c631776b818ca28bea53bfeab11dfe4b6a4ae (patch)
tree311e2c2566df0648760f72c8dfbfa504a46a895e /meta/recipes-support
parente842e4fdbd05f9a0d9439c98ed32277d60119e3f (diff)
downloadpoky-663c631776b818ca28bea53bfeab11dfe4b6a4ae.tar.gz
gpgme: Fix with with largefile support
(From OE-Core rev: 0b187e81732b7be3aaa35ce21b34c41c609322c3) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch42
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.18.0.bb1
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch b/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch
new file mode 100644
index 0000000000..be58c42128
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch
@@ -0,0 +1,42 @@
1From be33cf1812b4c2a3ed85fb2532992bfb2b27b3be Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 15 Dec 2022 08:44:13 -0800
4Subject: [PATCH] posix-io.c: Use off_t instead of off64_t
5
6configure.ac checks for largefile support via AC_SYS_LARGEFILE already,
7therefore use off_t and ino_t instead of 64bit variants. Musl e.g. does
8not define them without _LARGEFILE64_SOURCE and error is not seen on
9glibc because _GNU_SOURCE defines _LARGEFILE64_SOURCE
10
11Fixes errors like below on 32-bit musl systems
12
13../../../../../../../../workspace/sources/gpgme/src/posix-io.c:77:3: error: unknown type name 'ino64_t'; did you mean 'int64_t'?
14 ino64_t d_ino;
15 ^~~~~~~
16 int64_t
17 ^
18../../../../../../../../workspace/sources/gpgme/src/posix-io.c:78:3: error: unknown type name 'off64_t'; did you mean 'off_t'?
19 off64_t d_off;
20 ^~~~~~~
21
22Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2022-December/035222.html]
23Signed-off-by: Khem Raj <raj.khem@gmail.com>
24---
25 src/posix-io.c | 4 ++--
26 1 file changed, 2 insertions(+), 2 deletions(-)
27
28diff --git a/src/posix-io.c b/src/posix-io.c
29index 0d0a98b..286a626 100644
30--- a/src/posix-io.c
31+++ b/src/posix-io.c
32@@ -74,8 +74,8 @@
33 * define it ourselves. */
34 struct linux_dirent64
35 {
36- ino64_t d_ino;
37- off64_t d_off;
38+ ino_t d_ino;
39+ off_t d_off;
40 unsigned short d_reclen;
41 unsigned char d_type;
42 char d_name[];
diff --git a/meta/recipes-support/gpgme/gpgme_1.18.0.bb b/meta/recipes-support/gpgme/gpgme_1.18.0.bb
index 40c41876fa..7ff4837d6f 100644
--- a/meta/recipes-support/gpgme/gpgme_1.18.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.18.0.bb
@@ -21,6 +21,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
21 file://0007-python-Add-variables-to-tests.patch \ 21 file://0007-python-Add-variables-to-tests.patch \
22 file://0008-do-not-auto-check-var-PYTHON.patch \ 22 file://0008-do-not-auto-check-var-PYTHON.patch \
23 file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ 23 file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \
24 file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \
24 " 25 "
25 26
26SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e" 27SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e"