[meta-qt5][PATCH 1/2] qtbase: Fix build with musl

[meta-qt5][PATCH 1/2] qtbase: Fix build with musl

[Khem Raj]

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 <raj.khem@gmail.com>
---
 .../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 <Martin.Jansa@gmail.com>
  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

[meta-qt5][PATCH 2/2] qtwebkit: Fix build with musl

[Khem Raj]

Make backtrace() API conditional to glibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ude-backtrace-API-for-non-glibc-libraries.patch | 38 ++++++++++++++++++++++
 recipes-qt/qt5/qtwebkit_git.bb                     |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch

diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
new file mode 100644
index 0000000..6a9d1f4
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
@@ -0,0 +1,38 @@
+From b345a3414a7d09b47586aac437d79e2bbfa52fb8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 5 Jun 2015 19:55:05 -0700
+Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
+
+It was excluding musl with current checks, so lets make it such that it
+considers only glibc when using backtrace API
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Source/WTF/wtf/Assertions.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
+index 1b2091f..ba03a28 100644
+--- a/Source/WTF/wtf/Assertions.cpp
++++ b/Source/WTF/wtf/Assertions.cpp
+@@ -61,7 +61,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+ #include <execinfo.h>
+@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
+ 
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
+     *size = backtrace(stack, *size);
+ #elif OS(WINDOWS) && !OS(WINCE)
+     // The CaptureStackBackTrace function is available in XP, but it is not defined
+-- 
+2.1.4
+
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 77568af..bad44ef 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -20,6 +20,7 @@ ARM_INSTRUCTION_SET = "arm"
 SRC_URI += "\
     file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
     file://0002-Remove-TEXTREL-tag-in-x86.patch \
+    file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \
 "
 
 PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel"
-- 
2.1.4

Re: [meta-qt5][PATCH 1/2] qtbase: Fix build with musl

[Martin Jansa]

On Mon, Jun 08, 2015 at 09:56:36AM -0700, Khem Raj wrote:
> 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

Can you prepare the patch in:
https://github.com/meta-qt5/qtbase/commits/b5.4-shared
and generate it with format-patch?

This way it's hard to see what's the real change and what's just
formating from different diff.

Thanks

> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../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 <Martin.Jansa@gmail.com>
>   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
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [meta-qt5][PATCH 1/2] qtbase: Fix build with musl

[Khem Raj]

On Mon, Jun 8, 2015 at 1:05 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Jun 08, 2015 at 09:56:36AM -0700, Khem Raj wrote:
>> 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
>
> Can you prepare the patch in:
> https://github.com/meta-qt5/qtbase/commits/b5.4-shared
> and generate it with format-patch?
>
> This way it's hard to see what's the real change and what's just
> formating from different diff.

you are basically asking for git based workflow for generating patches
and not do
quilt based  patch refresh updates ?

I want to understand the process

>
> Thanks
>
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  .../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 <Martin.Jansa@gmail.com>
>>   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
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-qt5][PATCH 1/2] qtbase: Fix build with musl

[Martin Jansa]

On Mon, Jun 08, 2015 at 01:13:08PM -0400, Khem Raj wrote:
> On Mon, Jun 8, 2015 at 1:05 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Mon, Jun 08, 2015 at 09:56:36AM -0700, Khem Raj wrote:
> >> 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
> >
> > Can you prepare the patch in:
> > https://github.com/meta-qt5/qtbase/commits/b5.4-shared
> > and generate it with format-patch?
> >
> > This way it's hard to see what's the real change and what's just
> > formating from different diff.
> 
> you are basically asking for git based workflow for generating patches
> and not do
> quilt based  patch refresh updates ?

yes

> I want to understand the process

If it's too much to ask, I'll just update b5.4* branches in
https://github.com/meta-qt5/qtbase myself before applying this patch,
but basically when I'm upgrading to newer version, I usually want to use
git to just rebase the patches for newer revision (or completely new
branch like now when upgrading from 5.4 to 5.5 and having up2data
patches in qtbase git repository is very useful, when I'm done I just
git format-patch them to refresh .patch files in meta-qt5.

For new meta-qt5 patches it's simple, I can just use git am to add them
in meta-qt5/qtbase, for refreshing patches I need to be more careful not
to forget to do this, before I do next version/revision upgrade.

> > Thanks
> >
> >>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ---
> >>  .../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 <Martin.Jansa@gmail.com>
> >>   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
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> > --
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [meta-qt5][PATCH 1/2] qtbase: Fix build with musl

[Khem Raj]

On Mon, Jun 8, 2015 at 1:24 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> If it's too much to ask, I'll just update b5.4* branches in
> https://github.com/meta-qt5/qtbase myself before applying this patch,
> but basically when I'm upgrading to newer version, I usually want to use
> git to just rebase the patches for newer revision (or completely new
> branch like now when upgrading from 5.4 to 5.5 and having up2data
> patches in qtbase git repository is very useful, when I'm done I just
> git format-patch them to refresh .patch files in meta-qt5.
>
> For new meta-qt5 patches it's simple, I can just use git am to add them
> in meta-qt5/qtbase, for refreshing patches I need to be more careful not
> to forget to do this, before I do next version/revision upgrade.

essentially, you have created forks of qt repos from upstream. Are you
also syncing them on regular bases ?
So we never rebase/refresh the patches but do incremental patches
unless you decide to squash them ?

I am fine with this workflow. I have something similar in mind for
other components.It will help us push component
patches upstream as well. I am doing something similar for toolchain
components on my own but in the end generating
patches for public consumption.

Re: [meta-qt5][PATCH 1/2] qtbase: Fix build with musl

[Martin Jansa]

On Mon, Jun 08, 2015 at 01:58:03PM -0400, Khem Raj wrote:
> On Mon, Jun 8, 2015 at 1:24 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > If it's too much to ask, I'll just update b5.4* branches in
> > https://github.com/meta-qt5/qtbase myself before applying this patch,
> > but basically when I'm upgrading to newer version, I usually want to use
> > git to just rebase the patches for newer revision (or completely new
> > branch like now when upgrading from 5.4 to 5.5 and having up2data
> > patches in qtbase git repository is very useful, when I'm done I just
> > git format-patch them to refresh .patch files in meta-qt5.
> >
> > For new meta-qt5 patches it's simple, I can just use git am to add them
> > in meta-qt5/qtbase, for refreshing patches I need to be more careful not
> > to forget to do this, before I do next version/revision upgrade.
> 
> essentially, you have created forks of qt repos from upstream. Are you
> also syncing them on regular bases ?

Yes, but I sync them only when I want to introduce new revision/version
in meta-qt5 or when I'm adding new patch sent to this ML or update of
patch (if I don't forget to do it after testing it in jenkins build).

> So we never rebase/refresh the patches but do incremental patches
> unless you decide to squash them ?

I always do rebase, but I don't expect other contributors to do it
unless they're sending patch upgrading revisions/versions used in .bb
files.

Incremental patches are always welcome even for issues like this one,
because it's easier for me to "git am" + "git rebase -i" to squash them
into correct patch and refresh with git format-patch.

> I am fine with this workflow. I have something similar in mind for
> other components.It will help us push component
> patches upstream as well. I am doing something similar for toolchain
> components on my own but in the end generating
> patches for public consumption.

Yes, it's sometimes a bit annoying churn in .patch files, but having
simple git branch with all our changes in good format for pushing them
upstream is IMHO worth it. That's why I always prefer rebase over merge,
because I want to resolve conflicts once and then have the patch ready
for upstreaming.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com