diff mbox series

gpgme: Use 64bit off_t consistently

Message ID 20230329223355.2190782-1-raj.khem@gmail.com
State New
Headers show
Series gpgme: Use 64bit off_t consistently | expand

Commit Message

Khem Raj March 29, 2023, 10:33 p.m. UTC 
swig needs this defined as well

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-Ensure-64bit-off_t-is-used.patch     | 35 +++++++++++++++++++
 meta/recipes-support/gpgme/gpgme_1.18.0.bb    |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-support/gpgme/gpgme/0001-Ensure-64bit-off_t-is-used.patch

Comments

Alexander Kanavin March 30, 2023, 10:14 a.m. UTC | #1 
On Thu, 30 Mar 2023 at 00:34, Khem Raj <raj.khem@gmail.com> wrote:
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Wed, 29 Mar 2023 15:31:20 -0700
> +Subject: [PATCH] Ensure 64bit off_t is used
> +
> +This ensures that consistent off_t is used across python modules and
> +main gpgme
> +
> +Fixes
> +| swig -python -threads -py3 -DHAVE_CONFIG_H=1 -DHAVE_DATA_H=1 -DIN_TREE_BUILD=1 -Ipython3-gpg -outdir python3-gpg/lib.linux-x86_64-3.11/gpg -o python3-gpg/gpgme_wrap.c python3-gpg/gpgme.i
> +| Deprecated command line option: -py3. Ignored, this option is no longer supported.
> +| python3-gpg/gpgme.h:111: Error: CPP #error "GPGME was compiled with _FILE_OFFSET_BITS = 64, please see the section "Largefile support (LFS)" in the GPGME manual.". Use the -cpperraswarn option to continue swig processing.
> +| error: command '/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux-musl/gpgme/1.18.0-r0/recipe-sysroot-native/usr/bin/swig' failed with exit code 1
> +
> +Upstream-Status: Pending

Please submit upstream first.

Alex
diff mbox series

Patch

diff --git a/meta/recipes-support/gpgme/gpgme/0001-Ensure-64bit-off_t-is-used.patch b/meta/recipes-support/gpgme/gpgme/0001-Ensure-64bit-off_t-is-used.patch
new file mode 100644
index 0000000000..59a6e818ec
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-Ensure-64bit-off_t-is-used.patch
@@ -0,0 +1,35 @@ 
+From 4449b70eb1d89ee71b45bf9f113016f969d0ed38 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 29 Mar 2023 15:31:20 -0700
+Subject: [PATCH] Ensure 64bit off_t is used
+
+This ensures that consistent off_t is used across python modules and
+main gpgme
+
+Fixes
+| swig -python -threads -py3 -DHAVE_CONFIG_H=1 -DHAVE_DATA_H=1 -DIN_TREE_BUILD=1 -Ipython3-gpg -outdir python3-gpg/lib.linux-x86_64-3.11/gpg -o python3-gpg/gpgme_wrap.c python3-gpg/gpgme.i
+| Deprecated command line option: -py3. Ignored, this option is no longer supported.
+| python3-gpg/gpgme.h:111: Error: CPP #error "GPGME was compiled with _FILE_OFFSET_BITS = 64, please see the section "Largefile support (LFS)" in the GPGME manual.". Use the -cpperraswarn option to continue swig processing.
+| error: command '/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux-musl/gpgme/1.18.0-r0/recipe-sysroot-native/usr/bin/swig' failed with exit code 1
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lang/python/setup.py.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
+index 006216d..3c540d5 100755
+--- a/lang/python/setup.py.in
++++ b/lang/python/setup.py.in
+@@ -52,6 +52,7 @@ if top_builddir:
+         HAVE_CONFIG_H=1,
+         HAVE_DATA_H=1,
+         IN_TREE_BUILD=1,
++        _FILE_OFFSET_BITS=64,
+     )
+ 
+ if hasattr(subprocess, 'DEVNULL'):
+-- 
+2.40.0
+
diff --git a/meta/recipes-support/gpgme/gpgme_1.18.0.bb b/meta/recipes-support/gpgme/gpgme_1.18.0.bb
index a7b0de44a5..1a7a21f7cc 100644
--- a/meta/recipes-support/gpgme/gpgme_1.18.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.18.0.bb
@@ -23,6 +23,7 @@  SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
            file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \
            file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \
            file://0001-autogen.sh-remove-unknown-in-version.patch \
+           file://0001-Ensure-64bit-off_t-is-used.patch \
            "
 
 SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e"