[Buildroot] [PATCH 1/1] package/qt5/qt5base: fix musl build

[Buildroot] [PATCH 1/1] package/qt5/qt5base: fix musl build

[Bernd Kuhls]

Fixes
http://autobuild.buildroot.net/results/a15/a1586717154efb6495dfcdb5c7ce11a047dd68db/
http://autobuild.buildroot.net/results/363/3636ddcc0efa974c674f36d3c65eea5beb32af52/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...Invert-conditional-for-defining-QT_SOCKLE.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch

diff --git a/package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
new file mode 100644
index 0000000..55cf480
--- /dev/null
+++ b/package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
@@ -0,0 +1,44 @@
+Fix musl build
+
+Downloaded from
+https://github.com/meta-qt5/meta-qt5/blob/d9d1d04760430cd0e5edd1764d832860715e7b83/recipes-qt/qt5/qtbase/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
+and adjusted path.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+
+From 8f09897de948cea8861ca95e182f442cf15a339e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 8 Jun 2015 13:59:25 -0700
+Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T
+
+This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
+only when its glibc < 2 and not also for the libraries which may define
+it as per standards but are not glibc, e.g. musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
+index dd12003..8623651 100644
+--- a/mkspecs/linux-g++/qplatformdefs.h
++++ b/mkspecs/linux-g++/qplatformdefs.h
+@@ -86,10 +86,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+-- 
+2.1.4
+
-- 
2.7.0.rc3

[Buildroot] [PATCH 1/1] package/qt5/qt5base: fix musl build

[Thomas Petazzoni]

Bernd,

Thanks for this patch, but see below.

On Sat, 30 Jan 2016 21:52:46 +0100, Bernd Kuhls wrote:
> Fixes
> http://autobuild.buildroot.net/results/a15/a1586717154efb6495dfcdb5c7ce11a047dd68db/
> http://autobuild.buildroot.net/results/363/3636ddcc0efa974c674f36d3c65eea5beb32af52/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  ...Invert-conditional-for-defining-QT_SOCKLE.patch | 44 ++++++++++++++++++++++
>  1 file changed, 44 insertions(+)
>  create mode 100644 package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
> 
> diff --git a/package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
> new file mode 100644
> index 0000000..55cf480
> --- /dev/null
> +++ b/package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
> @@ -0,0 +1,44 @@
> +Fix musl build
> +
> +Downloaded from
> +https://github.com/meta-qt5/meta-qt5/blob/d9d1d04760430cd0e5edd1764d832860715e7b83/recipes-qt/qt5/qtbase/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
> +and adjusted path.
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Have you read my review of some of your previous patches? I already
said that this should go inside the Git commit log of the patch, so
that the patch remains a proper Git formatted patch.

> +From 8f09897de948cea8861ca95e182f442cf15a339e Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Mon, 8 Jun 2015 13:59:25 -0700
> +Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T
> +
> +This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
> +only when its glibc < 2 and not also for the libraries which may define
> +it as per standards but are not glibc, e.g. musl
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>

I.e, add here:

[Bernd: downloaded from .... and adjusted path.]
Signed-off-by: ...

Can you adjust to this convention ?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com