| 1 |
commit: 9b7fa0e214e6c3dc33bfd41139a87dfcf0574c8f |
| 2 |
Author: Dave Flogeras <dflogeras2 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Sep 29 13:20:29 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 1 01:59:39 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9b7fa0e2 |
| 7 |
|
| 8 |
dev-qt/qtnetwork: fix build on non-glibc systems (musl/uclibc) |
| 9 |
|
| 10 |
This patch has been accepted by upstream for the 5.6 branch, but won't |
| 11 |
be backported. See qtbase commit 813f468a14fb84af43c1f8fc0a1430277358eba2. |
| 12 |
|
| 13 |
Gentoo-Bug: 554556 |
| 14 |
|
| 15 |
.../qtnetwork/files/qtnetwork-5.5-socklen_t.patch | 40 ++++++++++++++++++++++ |
| 16 |
dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild | 4 +++ |
| 17 |
dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild | 4 +++ |
| 18 |
3 files changed, 48 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..dd8c335 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch |
| 25 |
@@ -0,0 +1,40 @@ |
| 26 |
+From 813f468a14fb84af43c1f8fc0a1430277358eba2 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Dave Flogeras <dflogeras2@×××××.com> |
| 28 |
+Date: Tue, 29 Sep 2015 08:52:31 -0300 |
| 29 |
+Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc. |
| 30 |
+ |
| 31 |
+Rather than treating >=glibc-2 specially, we treat <glibc-2 specially |
| 32 |
+and all other libc implementations as POSIX. |
| 33 |
+ |
| 34 |
+This was found here http://patchwork.openembedded.org/patch/94947/ and |
| 35 |
+tested with armv6j-hardfloat-linux-uclibceabi and |
| 36 |
+armv6j-hardfloat-linux-musleabi. |
| 37 |
+ |
| 38 |
+Change-Id: I3850b1561a2e240f6564afedd80ce39407cc50b6 |
| 39 |
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@××××××××××××.com> |
| 40 |
+Reviewed-by: Thiago Macieira <thiago.macieira@×××××.com> |
| 41 |
+--- |
| 42 |
+ mkspecs/linux-g++/qplatformdefs.h | 6 +++--- |
| 43 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
| 44 |
+ |
| 45 |
+diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h |
| 46 |
+index 5c18632..95a5758 100644 |
| 47 |
+--- a/mkspecs/linux-g++/qplatformdefs.h |
| 48 |
++++ b/mkspecs/linux-g++/qplatformdefs.h |
| 49 |
+@@ -78,10 +78,10 @@ |
| 50 |
+ |
| 51 |
+ #undef QT_SOCKLEN_T |
| 52 |
+ |
| 53 |
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2) |
| 54 |
+-#define QT_SOCKLEN_T socklen_t |
| 55 |
+-#else |
| 56 |
++#if defined(__GLIBC__) && (__GLIBC__ < 2) |
| 57 |
+ #define QT_SOCKLEN_T int |
| 58 |
++#else |
| 59 |
++#define QT_SOCKLEN_T socklen_t |
| 60 |
+ #endif |
| 61 |
+ |
| 62 |
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
| 63 |
+-- |
| 64 |
+2.6.0 |
| 65 |
+ |
| 66 |
|
| 67 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild b/dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild |
| 68 |
index 934c523..5be50a5 100644 |
| 69 |
--- a/dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild |
| 70 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild |
| 71 |
@@ -27,6 +27,10 @@ RDEPEND="${DEPEND} |
| 72 |
networkmanager? ( net-misc/networkmanager ) |
| 73 |
" |
| 74 |
|
| 75 |
+PATCHES=( |
| 76 |
+ "${FILESDIR}/${PN}-5.5-socklen_t.patch" # bug 554556 |
| 77 |
+) |
| 78 |
+ |
| 79 |
QT5_TARGET_SUBDIRS=( |
| 80 |
src/network |
| 81 |
src/plugins/bearer/generic |
| 82 |
|
| 83 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild |
| 84 |
index 934c523..5be50a5 100644 |
| 85 |
--- a/dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild |
| 86 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild |
| 87 |
@@ -27,6 +27,10 @@ RDEPEND="${DEPEND} |
| 88 |
networkmanager? ( net-misc/networkmanager ) |
| 89 |
" |
| 90 |
|
| 91 |
+PATCHES=( |
| 92 |
+ "${FILESDIR}/${PN}-5.5-socklen_t.patch" # bug 554556 |
| 93 |
+) |
| 94 |
+ |
| 95 |
QT5_TARGET_SUBDIRS=( |
| 96 |
src/network |
| 97 |
src/plugins/bearer/generic |
Archives