Skip to contentSkip to conversation

qtwebengine: Fix build on musl

PATCH New Khem Raj 1 participant 3 messages Jul 13, 2017

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 qtwebengine: Fix build on musl

import needed chromium patches from meta-browser

---
 ...-Define-TEMP_FAILURE_RETRY-if-not-defined.patch | 35 ++++++++++
 ...03-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 48 +++++++++++++
 .../0004-include-fcntl.h-for-loff_t.patch          | 25 +++++++
 ...off64_t-instead-of-the-internal-__off64_t.patch | 65 +++++++++++++++++
 .../0006-linux-glibc-make-the-distinction.patch    | 26 +++++++
 ...o-not-include-glibc_weak_symbols-for-musl.patch | 26 +++++++
 ...-member-name-__si_fields-from-LinuxSigInf.patch | 26 +++++++
 .../0009-Match-syscalls-to-match-musl.patch        | 47 +++++++++++++
 ...ninit-and-res_nclose-for-non-glibc-platfo.patch | 81 ++++++++++++++++++++++
 .../0011-Do-not-define-__sbrk-on-musl.patch        | 29 ++++++++
 .../0012-Adjust-default-pthread-stack-size.patch   | 51 ++++++++++++++
 ...3-include-asm-generic-ioctl.h-for-TCGETS2.patch | 25 +++++++
 .../0014-link-with-libexecinfo-on-musl.patch       | 25 +++++++
 ...tcmalloc-Use-off64_t-insread-of-__off64_t.patch | 26 +++++++
 recipes-qt/qt5/qtwebengine_git.bb                  | 31 ++++++++-
 15 files changed, 565 insertions(+), 1 deletion(-)
 create mode 100644 recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch
recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch new file +35 -0
new file mode 100644
index 0000000..c56cfc7
@@ -0,0 +1,35 @@
+From 89d6283c91f2229cc51f473eed344de97d09e946 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 7 Jul 2017 14:01:12 -0700
+Subject: [PATCH 01/12] sandbox: Define TEMP_FAILURE_RETRY if not defined
+
+Musl does not define this Macro
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ sandbox/linux/suid/sandbox.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c
+index b655d1c79..3de34e36f 100644
+--- a/sandbox/linux/suid/sandbox.c
++++ b/sandbox/linux/suid/sandbox.c
+@@ -44,6 +44,15 @@ static bool DropRoot();
+ 
+ #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)
+ 
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ static void FatalError(const char* msg, ...)
+     __attribute__((noreturn, format(printf, 1, 2)));
+ 
+-- 
+2.13.2
+
recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch new file +48 -0

48 lines not on this page · raw message

recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch new file +25 -0
new file mode 100644
index 0000000..da8503b
@@ -0,0 +1,25 @@
+From a0b40dcdfb3331d2b8351bdfb27f1ba3e8a2c33c Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 7 Jul 2017 14:37:49 -0700
+Subject: [PATCH 04/12] include fcntl.h for loff_t
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+index bdbc4b7e3..b53dd46c5 100644
+--- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
++++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+@@ -151,6 +151,7 @@ extern "C" {
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
++#include <fcntl.h>
+ #include <sys/ptrace.h>
+ #include <sys/resource.h>
+ #include <sys/time.h>
+-- 
+2.13.2
+
recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch new file +65 -0

65 lines not on this page · raw message

recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch new file +26 -0
new file mode 100644
index 0000000..257d873
@@ -0,0 +1,26 @@
+From 4913850cd644e1fd44ecade5e9faa460de35a7d6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 7 Jul 2017 14:54:38 -0700
+Subject: [PATCH 06/12] linux != glibc, make the distinction
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ base/allocator/allocator_check.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/base/allocator/allocator_check.cc b/base/allocator/allocator_check.cc
+index 5a0564d2f..8c2dc6491 100644
+--- a/base/allocator/allocator_check.cc
++++ b/base/allocator/allocator_check.cc
+@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() {
+ #if defined(OS_WIN) && defined(ALLOCATOR_SHIM)
+   // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called.
+   return g_is_win_shim_layer_initialized;
+-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \
++#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \
+     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+ // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
+ // TODO(primiano): replace with an include once base can depend on allocator.
+-- 
+2.13.2
+
recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch new file +26 -0
new file mode 100644
index 0000000..b999c59
@@ -0,0 +1,26 @@
+From 482e77e9562b8a158b5b212e9f1c83c697fed2e2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 7 Jul 2017 15:09:02 -0700
+Subject: [PATCH 07/12] allocator: Do not include glibc_weak_symbols for musl
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ base/allocator/allocator_shim.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc
+index 57a398aaa..54c79063a 100644
+--- a/base/allocator/allocator_shim.cc
++++ b/base/allocator/allocator_shim.cc
+@@ -263,7 +263,7 @@ void ShimFree(void* address) {
+ // In the case of tcmalloc we also want to plumb into the glibc hooks
+ // to avoid that allocations made in glibc itself (e.g., strdup()) get
+ // accidentally performed on the glibc heap instead of the tcmalloc one.
+-#if defined(USE_TCMALLOC)
++#if defined(USE_TCMALLOC) && defined(__GLIBC__)
+ #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
+ #endif
+ 
+-- 
+2.13.2
+
recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch new file +26 -0
new file mode 100644
index 0000000..3bd0a9d
@@ -0,0 +1,26 @@
+From 3d12eb821e105111cbd88f5598746bd77c3a9ef0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 7 Jul 2017 15:12:39 -0700
+Subject: [PATCH 08/12] Use correct member name __si_fields from LinuxSigInfo
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ sandbox/linux/seccomp-bpf/trap.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc
+index 003708d2c..0fef3148f 100644
+--- a/sandbox/linux/seccomp-bpf/trap.cc
++++ b/sandbox/linux/seccomp-bpf/trap.cc
+@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
+   // most versions of glibc don't include this information in siginfo_t. So,
+   // we need to explicitly copy it into a arch_sigsys structure.
+   struct arch_sigsys sigsys;
+-  memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
+ 
+ #if defined(__mips__)
+   // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the
+-- 
+2.13.2
+
recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch new file +47 -0

47 lines not on this page · raw message

recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch new file +81 -0

81 lines not on this page · raw message

recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch new file +29 -0
new file mode 100644
index 0000000..a2c2b90
@@ -0,0 +1,29 @@
+From 8a6553232988a5bfc8f0c48d4214a3982025fb2c Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 7 Jul 2017 15:39:57 -0700
+Subject: [PATCH 11/12] Do not define __sbrk on musl
+
+musl libc does not have sbrk. on musl libc will only work when called with 0 as
+argument, so we just let it out for now
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
+index edc8cf2db..a868b50d3 100644
+--- a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
++++ b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
+@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
+ }
+ 
+ // Don't hook sbrk() in Android, since it doesn't expose __sbrk.
+-#if !defined(__ANDROID__)
++#if !defined(__ANDROID__) && defined(__GLIBC__)
+ // libc's version:
+ extern "C" void* __sbrk(ptrdiff_t increment);
+ 
+-- 
+2.13.2
+
recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch new file +51 -0

51 lines not on this page · raw message

recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch new file +25 -0
new file mode 100644
index 0000000..abe2eaf
@@ -0,0 +1,25 @@
+From d5014cf9a97cf97a6e9bb7f751c7cee3c24e17fd Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 7 Jul 2017 17:15:34 -0700
+Subject: [PATCH 1/2] include asm-generic/ioctl.h for TCGETS2
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ device/serial/serial_io_handler_posix.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/device/serial/serial_io_handler_posix.cc b/device/serial/serial_io_handler_posix.cc
+index 158c374a0..c08fb4a8e 100644
+--- a/device/serial/serial_io_handler_posix.cc
++++ b/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include "base/posix/eintr_wrapper.h"
+ #include "build/build_config.h"
+-- 
+2.13.2
+
recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch new file +25 -0
new file mode 100644
index 0000000..1b65420
@@ -0,0 +1,25 @@
+From 4b5aab95e34e1cbebc7566c1267cddc2560601c8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 7 Jul 2017 17:41:43 -0700
+Subject: [PATCH 2/2] link with libexecinfo on musl
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ base/base.gyp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/base/base.gyp b/base/base.gyp
+index 67e051ae4..7f5dfe214 100644
+--- a/base/base.gyp
++++ b/base/base.gyp
+@@ -126,6 +126,7 @@
+               '-lrt',
+               # For 'native_library_linux.cc'
+               '-ldl',
++              '-lexecinfo',
+             ],
+           },
+           'conditions': [
+-- 
+2.13.2
+
recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch new file +26 -0
new file mode 100644
index 0000000..2ef5433
@@ -0,0 +1,26 @@
+From 1a468dd5239ebdf013d9ffb3a2d181d0434b4c6c Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 8 Jul 2017 09:08:23 -0700
+Subject: [PATCH 2/2] tcmalloc: Use off64_t insread of __off64_t
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+index b53dd46c5..58da4d19d 100644
+--- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
++++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+@@ -1930,7 +1930,7 @@ typedef unsigned long int ulong;
+   #if defined(__x86_64__)
+     /* Need to make sure __off64_t isn't truncated to 32-bits under x32.  */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+-                                    __off64_t o) {
++                                    off64_t o) {
+       LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l),
+                                LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f),
+                                LSS_SYSCALL_ARG(d), (uint64_t)(o));
+-- 
+2.13.2
+
recipes-qt/qt5/qtwebengine_git.bb +30 -1
index e319a01..033bdaa 100644
@@ -24,7 +24,13 @@ DEPENDS += " \
 "
 
 DEPENDS += "yasm-native"
-EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm GYP_CONFIG+=generate_character_data=0"
+DEPENDS_append_libc-musl = " libexecinfo"
+
+EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \
+                        GYP_CONFIG+=generate_character_data=0 \
+                        GYP_CONFIG+=use_allocator=none \
+                        GYP_CONFIG+=use_experimental_allocator_shim=false \
+"
 
 # To use system ffmpeg you need to enable also libwebp, opus, vpx											    
 # Only depenedencies available in oe-core are enabled by default
@@ -88,6 +94,13 @@ do_configure() {
         -after ${EXTRA_QMAKEVARS_POST}
 }
 
+do_configure_prepend_libc-musl() {
+        for f in `find ${S}/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ -name config.h -o -name config.asm`; do
+                sed -i -e "s:define HAVE_SYSCTL 1:define HAVE_SYSCTL 0:g" $f
+        done
+        sed -i -e "s:define HAVE_STRUCT_MALLINFO 1:/*undef HAVE_STRUCT_MALLINFO */:g" ${S}/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/config_linux.h
+}
+
 do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
 
 do_install_append() {
@@ -119,6 +132,22 @@ SRC_URI += " \
     file://0003-chromium-v8-fix-build-with-gcc7.patch;patchdir=src/3rdparty \
     file://0004-chromium-WebKit-fix-build-with-gcc7.patch;patchdir=src/3rdparty \
 "
+SRC_URI_append_libc-musl = "\
+    file://0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch;patchdir=src/3rdparty/chromium \
+    file://0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty/chromium \
+    file://0004-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty/chromium \
+    file://0005-use-off64_t-instead-of-the-internal-__off64_t.patch;patchdir=src/3rdparty/chromium \
+    file://0006-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty/chromium \
+    file://0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch;patchdir=src/3rdparty/chromium \
+    file://0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch;patchdir=src/3rdparty/chromium \
+    file://0009-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty/chromium \
+    file://0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch;patchdir=src/3rdparty/chromium \
+    file://0011-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty/chromium \
+    file://0012-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty/chromium \
+    file://0013-include-asm-generic-ioctl.h-for-TCGETS2.patch;patchdir=src/3rdparty/chromium \
+    file://0014-link-with-libexecinfo-on-musl.patch;patchdir=src/3rdparty/chromium \
+    file://0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch;patchdir=src/3rdparty/chromium \
+"
 
 SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc"
 SRCREV_chromium = "15d257fd921f37b32ef643225f21df0ea24c8302"
Signature · 1 line
2.13.2
author
#1 lore raw

PATCH 2/3 qtvirtualkeyboard: Include sys/time.h

Fixes build on musl

---
 .../0001-include-sys-time.h-for-timeval.patch      | 28 ++++++++++++++++++++++
 recipes-qt/qt5/qtvirtualkeyboard_git.bb            |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch
recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch new file +28 -0
new file mode 100644
index 0000000..8518ae9
@@ -0,0 +1,28 @@
+From 78106c5b939cc7d84710fe4c8e2a356ac1f110ef Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 12 Jul 2017 23:59:52 -0700
+Subject: [PATCH] include sys/time.h for timeval
+
+Musl exposes this issue since its not indirectly
+including sys/time.h like glibc
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/virtualkeyboard/3rdparty/pinyin/include/userdict.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h b/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h
+index 1b9673f..924be7b 100644
+--- a/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h
++++ b/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h
+@@ -24,6 +24,7 @@
+ // Debug performance for operations
+ // #define ___DEBUG_PERF___
+ 
++#include <sys/time.h>
+ #ifdef _WIN32
+ #include <winsock.h> // timeval
+ #else
+-- 
+2.13.2
+
recipes-qt/qt5/qtvirtualkeyboard_git.bb +1 -0
index 08914b1..244e529 100644
@@ -5,6 +5,7 @@ LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
 "
+SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch"
 
 # To enabled Nuance T9 Write support, you need to provide the licensed components
 # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
Signature · 1 line
2.13.2
author
#2 lore raw

PATCH 3/3 qt5-creator: Link with libexecinfo on musl

In reply to Khem Raj
---
 recipes-qt/qt5/qt5-creator/musl-backtrace.patch | 18 ++++++++++++++++++
 recipes-qt/qt5/qt5-creator_3.5.1.bb             |  6 ++++++
 2 files changed, 24 insertions(+)
 create mode 100644 recipes-qt/qt5/qt5-creator/musl-backtrace.patch
recipes-qt/qt5/qt5-creator/musl-backtrace.patch new file +18 -0
new file mode 100644
index 0000000..fc7f86c
@@ -0,0 +1,18 @@
+Index: qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro
+===================================================================
+--- qt-creator-opensource-src-3.5.1.orig/src/plugins/debugger/debugger.pro
++++ qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro
+@@ -148,3 +148,4 @@ include(qml/qml.pri)
+ include(namedemangler/namedemangler.pri)
+ 
+ include(shared/shared.pri)
++LIBS  *= -lexecinfo
+Index: qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri
+===================================================================
+--- qt-creator-opensource-src-3.5.1.orig/src/plugins/qmldesigner/config.pri
++++ qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri
+@@ -9,3 +9,4 @@ equals(TMP_BAUHAUS_NO_OUTPUT, true):DEFI
+ DEFINES += ENABLE_TEXT_VIEW
+ 
+ isEmpty($$(BAUHAUS_OUTPUT_IN_TEST)):DEFINES += QDEBUG_IN_TESTS WARNINGS_IN_TESTS
++LIBS  *= -lexecinfo
recipes-qt/qt5/qt5-creator_3.5.1.bb +6 -0
index c85f38c..786b202 100644
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = " \
 inherit qmake5
 
 DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg qtquick1"
+DEPENDS_append_libc-musl = " libexecinfo"
 
 SRC_URI = " \
     http://download.qt.io/official_releases/qtcreator/3.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \
@@ -25,6 +26,10 @@ SRC_URI = " \
     file://0001-Qmlpuppet-add-missing-includes.patch \
     file://qtcreator.desktop.in \
 "
+
+SRC_URI_append_libc-musl = " file://musl-backtrace.patch "
+
+
 SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05"
 SRC_URI[sha256sum] = "5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65"
 
@@ -32,6 +37,7 @@ S = "${WORKDIR}/qt-creator-opensource-src-${PV}"
 
 EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
 
+LDFLAGS_append_libc-musl = " -lexecinfo "
 do_configure_append() {
     # Find native tools
     sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile
Signature · 1 line
2.13.2