This is a generic fix to accomodate musl which is adhering to posix and doesnt have legacy to carry, so lets invert the conditional so the special legacy case of glibc is checked and else part then covers rest of cases which are newer glibc/uclibc and musl
Signed-off-by: Khem Raj <[email protected]> --- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 43 ++++++++++------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 0f6bcbe..d54079c 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -51,10 +51,10 @@ Signed-off-by: Martin Jansa <[email protected]> create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h -diff --git a/configure b/configure -index 6ce6753..0a00d6d 100755 ---- a/configure -+++ b/configure +Index: git/configure +=================================================================== +--- git.orig/configure ++++ git/configure @@ -316,6 +316,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" } @@ -128,7 +128,7 @@ index 6ce6753..0a00d6d 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3216,7 +3234,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -3216,7 +3234,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ] exit 1 fi fi @@ -152,7 +152,7 @@ index 6ce6753..0a00d6d 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3725,14 +3751,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3725,14 +3751,14 @@ if true; then ###[ '!' -f "$outpath/bin/ fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= @@ -175,10 +175,10 @@ index 6ce6753..0a00d6d 100755 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then setBootstrapVariable QMAKE_CFLAGS_RELEASE -diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 6b37a04..dcf6025 100644 ---- a/mkspecs/features/configure.prf -+++ b/mkspecs/features/configure.prf +Index: git/mkspecs/features/configure.prf +=================================================================== +--- git.orig/mkspecs/features/configure.prf ++++ git/mkspecs/features/configure.prf @@ -63,12 +63,12 @@ defineTest(qtCompileTest) { } @@ -194,11 +194,10 @@ index 6b37a04..dcf6025 100644 log("yes$$escape_expand(\\n)") msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf -new file mode 100644 -index 0000000..2ad2810 +Index: git/mkspecs/linux-oe-g++/qmake.conf +=================================================================== --- /dev/null -+++ b/mkspecs/linux-oe-g++/qmake.conf ++++ git/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,40 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded @@ -240,11 +239,10 @@ index 0000000..2ad2810 +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) + +load(qt_config) -diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h -new file mode 100644 -index 0000000..dd12003 +Index: git/mkspecs/linux-oe-g++/qplatformdefs.h +=================================================================== --- /dev/null -+++ b/mkspecs/linux-oe-g++/qplatformdefs.h ++++ git/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1,100 @@ +/**************************************************************************** +** @@ -334,10 +332,10 @@ index 0000000..dd12003 + +#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) @@ -346,6 +344,3 @@ index 0000000..dd12003 +#endif + +#endif // QPLATFORMDEFS_H --- -2.4.2 - -- 2.1.4 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
