[Buildroot] [PATCH/next v2 1/1] package/qt5/qt5base: fix statx support with glibc >= 2.28

[Buildroot] [PATCH/next v2 1/1] package/qt5/qt5base: fix statx support with glibc >= 2.28

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: git-formatted patch (Thomas)
    re-sent because it did not appear on patchworks

 ...02-Fix-statx-support-with-glibc-2.28.patch | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 package/qt5/qt5base/5.11.1/0002-Fix-statx-support-with-glibc-2.28.patch

diff --git a/package/qt5/qt5base/5.11.1/0002-Fix-statx-support-with-glibc-2.28.patch b/package/qt5/qt5base/5.11.1/0002-Fix-statx-support-with-glibc-2.28.patch
new file mode 100644
index 0000000000..d7857471de
--- /dev/null
+++ b/package/qt5/qt5base/5.11.1/0002-Fix-statx-support-with-glibc-2.28.patch
@@ -0,0 +1,64 @@
+From c41b7d021309e26456cb4e2f9dd6a13aa5cea538 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 12 Aug 2018 20:14:40 +0200
+Subject: [PATCH] Fix statx support with glibc >= 2.28
+
+Ported statx-related changes from
+https://src.fedoraproject.org/cgit/rpms/qt5-qtbase.git/plain/qt5-qtbase-glibc.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ mkspecs/linux-g++/qplatformdefs.h         | 2 ++
+ src/corelib/io/qfilesystemengine_unix.cpp | 6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
+index 13523f0702..d32453162c 100644
+--- a/mkspecs/linux-g++/qplatformdefs.h
++++ b/mkspecs/linux-g++/qplatformdefs.h
+@@ -72,7 +72,9 @@
+ #include <sys/time.h>
+ #include <sys/shm.h>
+ #include <sys/socket.h>
++#if 0
+ #include <sys/stat.h>
++#endif
+ #include <sys/wait.h>
+ #include <netinet/in.h>
+ 
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index be6ce48d0c..5c2d3a1324 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -50,7 +50,9 @@
+ #include <pwd.h>
+ #include <stdlib.h> // for realpath()
+ #include <sys/types.h>
++#if 0
+ #include <sys/stat.h>
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <errno.h>
+@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirectory();
+ #  include <sys/syscall.h>
+ #  include <sys/sendfile.h>
+ #  include <linux/fs.h>
++#if 0
+ #  include <linux/stat.h>
++#endif
+ 
+ // in case linux/fs.h is too old and doesn't define it:
+ #ifndef FICLONE
+@@ -111,7 +115,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
+ { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+ #    endif
+ 
+-#    if !QT_CONFIG(statx) && defined(SYS_statx)
++#    if 0 && !QT_CONFIG(statx) && defined(SYS_statx)
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+ #    elif !QT_CONFIG(statx) && !defined(SYS_statx)
+-- 
+2.18.0
+
-- 
2.18.0

[Buildroot] [PATCH/next v2 1/1] package/qt5/qt5base: fix statx support with glibc >= 2.28

[Thomas Petazzoni]

Hello,

On Sun, 12 Aug 2018 22:38:34 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

It seems like
https://github.com/qt/qtbase/commits/5.11/src/corelib/io/qfilesystemengine_unix.cpp
has some proper upstream changes for this. It would make more sense to
backport those fixes, no ?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH/next v2 1/1] package/qt5/qt5base: fix statx support with glibc >= 2.28

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: switched to upstream patch (Thomas)

 ...0002-Fix-qmake-build-with-glibc-2.28.patch | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 package/qt5/qt5base/5.11.1/0002-Fix-qmake-build-with-glibc-2.28.patch

diff --git a/package/qt5/qt5base/5.11.1/0002-Fix-qmake-build-with-glibc-2.28.patch b/package/qt5/qt5base/5.11.1/0002-Fix-qmake-build-with-glibc-2.28.patch
new file mode 100644
index 0000000000..6d8bb28992
--- /dev/null
+++ b/package/qt5/qt5base/5.11.1/0002-Fix-qmake-build-with-glibc-2.28.patch
@@ -0,0 +1,74 @@
+From 25feee4e061b99edab79503d81f5bd045c6c8e3d Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Tue, 7 Aug 2018 09:38:42 -0700
+Subject: [PATCH] Fix qmake build with glibc 2.28
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We haven't yet run the configure checks to see if statx and renameat2
+are present in glibc, so this fails when we redefine the structures and
+functions.
+
+linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp'
+bits/statx.h:25:8: note: previous definition of 'struct statx_timestamp'
+qfilesystemengine_unix.cpp:110:12: error: 'int renameat2(int, const char*, int, const char*, unsigned int)' was declared 'extern' and later 'static' [-fpermissive]
+
+Change-Id: Ia741b559c24d46c78fb2fffd1548a792d22e3368
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
+Reviewed-by: J?ri Valdmann <juri.valdmann@qt.io>
+
+Downloaded from upstream commit
+http://code.qt.io/cgit/qt/qtbase.git/commit/?id=25feee4e061b99edab79503d81f5bd045c6c8e3d
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/corelib/global/qconfig-bootstrapped.h | 12 ++++++++++--
+ src/corelib/io/qfilesystemengine_unix.cpp |  2 +-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
+index 3469ebe5e6..c5585ea32a 100644
+--- a/src/corelib/global/qconfig-bootstrapped.h
++++ b/src/corelib/global/qconfig-bootstrapped.h
+@@ -98,10 +98,18 @@
+ #define QT_NO_QOBJECT
+ #define QT_FEATURE_process -1
+ #define QT_FEATURE_regularexpression -1
+-#define QT_FEATURE_renameat2 -1
++#ifdef __GLIBC_PREREQ
++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1)
++#else
++# define QT_FEATURE_renameat2 -1
++#endif
+ #define QT_FEATURE_sharedmemory -1
+ #define QT_FEATURE_slog2 -1
+-#define QT_FEATURE_statx -1
++#ifdef __GLIBC_PREREQ
++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
++#else
++# define QT_FEATURE_statx -1
++#endif
+ #define QT_FEATURE_syslog -1
+ #define QT_NO_SYSTEMLOCALE
+ #define QT_FEATURE_systemsemaphore -1
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index 0c9cdb8667..deb4a9f220 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -91,7 +91,6 @@ extern "C" NSString *NSTemporaryDirectory();
+ #  include <sys/syscall.h>
+ #  include <sys/sendfile.h>
+ #  include <linux/fs.h>
+-#  include <linux/stat.h>
+ 
+ // in case linux/fs.h is too old and doesn't define it:
+ #ifndef FICLONE
+@@ -112,6 +111,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
+ #    endif
+ 
+ #    if !QT_CONFIG(statx) && defined(SYS_statx)
++#      include <linux/stat.h>
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+ #    elif !QT_CONFIG(statx) && !defined(SYS_statx)
-- 
2.18.0

[Buildroot] [PATCH/next v2 1/1] package/qt5/qt5base: fix statx support with glibc >= 2.28

[Bernd Kuhls]

Am Mon, 13 Aug 2018 21:40:43 +0200 schrieb Bernd Kuhls:

> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: switched to upstream patch (Thomas)

Hi,

please ignore, this is really v3, follow-up patch sent.

Regards, Bernd

[Buildroot] [PATCH/next v2 1/1] package/qt5/qt5base: fix statx support with glibc >= 2.28

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: git-formatted patch (Thomas)

 ...02-Fix-statx-support-with-glibc-2.28.patch | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 package/qt5/qt5base/5.11.1/0002-Fix-statx-support-with-glibc-2.28.patch

diff --git a/package/qt5/qt5base/5.11.1/0002-Fix-statx-support-with-glibc-2.28.patch b/package/qt5/qt5base/5.11.1/0002-Fix-statx-support-with-glibc-2.28.patch
new file mode 100644
index 0000000000..d7857471de
--- /dev/null
+++ b/package/qt5/qt5base/5.11.1/0002-Fix-statx-support-with-glibc-2.28.patch
@@ -0,0 +1,64 @@
+From c41b7d021309e26456cb4e2f9dd6a13aa5cea538 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 12 Aug 2018 20:14:40 +0200
+Subject: [PATCH] Fix statx support with glibc >= 2.28
+
+Ported statx-related changes from
+https://src.fedoraproject.org/cgit/rpms/qt5-qtbase.git/plain/qt5-qtbase-glibc.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ mkspecs/linux-g++/qplatformdefs.h         | 2 ++
+ src/corelib/io/qfilesystemengine_unix.cpp | 6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
+index 13523f0702..d32453162c 100644
+--- a/mkspecs/linux-g++/qplatformdefs.h
++++ b/mkspecs/linux-g++/qplatformdefs.h
+@@ -72,7 +72,9 @@
+ #include <sys/time.h>
+ #include <sys/shm.h>
+ #include <sys/socket.h>
++#if 0
+ #include <sys/stat.h>
++#endif
+ #include <sys/wait.h>
+ #include <netinet/in.h>
+ 
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index be6ce48d0c..5c2d3a1324 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -50,7 +50,9 @@
+ #include <pwd.h>
+ #include <stdlib.h> // for realpath()
+ #include <sys/types.h>
++#if 0
+ #include <sys/stat.h>
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <errno.h>
+@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirectory();
+ #  include <sys/syscall.h>
+ #  include <sys/sendfile.h>
+ #  include <linux/fs.h>
++#if 0
+ #  include <linux/stat.h>
++#endif
+ 
+ // in case linux/fs.h is too old and doesn't define it:
+ #ifndef FICLONE
+@@ -111,7 +115,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
+ { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+ #    endif
+ 
+-#    if !QT_CONFIG(statx) && defined(SYS_statx)
++#    if 0 && !QT_CONFIG(statx) && defined(SYS_statx)
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+ #    elif !QT_CONFIG(statx) && !defined(SYS_statx)
+-- 
+2.18.0
+
-- 
2.18.0