diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-01-01 21:35:06 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2023-01-07 15:59:01 +0100 |
| commit | f1ac12036ef750330dffa4a13cf882b7c702288c (patch) | |
| tree | 7502954e4e547ccf6622bfd42db6687733785ffd | |
| parent | 8159b71f8c771aeaa0340c597666cae388b27528 (diff) | |
qtbase: Fix build with 64bit time_t on glibc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0023-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch | 37 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0023-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch b/recipes-qt/qt5/qtbase/0023-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch new file mode 100644 index 00000000..17a34761 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0023-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch @@ -0,0 +1,37 @@ +From 4e00087b393183493a0f7115fd41efc867bd3421 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 1 Jan 2023 21:30:23 -0800 +Subject: [PATCH] zlib: Do not undefine _FILE_OFFSET_BITS + +This is required for 64bit time_t to work with glibc as it needs +_FILE_OFFSET_BITS to be defined as 64 as well. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/3rdparty/zlib/src/gzguts.h | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/src/3rdparty/zlib/src/gzguts.h b/src/3rdparty/zlib/src/gzguts.h +index 20de7cb4ce..f6ab9357c7 100644 +--- a/src/3rdparty/zlib/src/gzguts.h ++++ b/src/3rdparty/zlib/src/gzguts.h +@@ -12,15 +12,6 @@ + # endif + #endif + +-#ifdef _LARGEFILE64_SOURCE +-# ifndef _LARGEFILE_SOURCE +-# define _LARGEFILE_SOURCE 1 +-# endif +-# ifdef _FILE_OFFSET_BITS +-# undef _FILE_OFFSET_BITS +-# endif +-#endif +- + #ifndef QT_BOOTSTRAPPED + # include <qconfig.h> + #endif +-- +2.39.0 + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 09dfbd48..a5ce677e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -37,6 +37,7 @@ SRC_URI += "\ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ + file://0023-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch \ " # Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with |