diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-10 10:10:17 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-10 10:10:17 +0200 |
commit | bc0625e7a03f9f04fdae3a89137812a216e977cd (patch) | |
tree | 4adb4e8357aea4922fd27e9758ea649deba73362 | |
parent | a22c728d16e449f3f573f4fd1324486753378592 (diff) | |
parent | 3cf0bbb8e1113376d5b5b26ecff362e180a180fd (diff) | |
download | meta-qt5-bc0625e7a03f9f04fdae3a89137812a216e977cd.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.10
* qtyocto/upstream/master:
qtbase_git: install qt.conf for the target
qtbase: mkspecs: add default toolchain options
qt5: remove use of OE_QMAKE_WAYLAND_SCANNER
gstreamer1.0-plugins-bad: add expansion parameter
qtlocation: correct PACKAGECONFIG for mapboxgl
qt5: use correct HostPrefix
qwt-qt5: rewrite completely
Fix missing OE_QMAKE_STRIP env variable
Upgrade to Qt 5.10.0
qtwebengine: make test suite succeed
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
ecipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Task-number: QTBUG-65164
Change-Id: I3a54ce7f3f82dcce2d9d1a13585a41178bda358c
15 files changed, 314 insertions, 105 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 3bc1279d..8f1d143a 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -48,6 +48,35 @@ export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" | |||
48 | 48 | ||
49 | inherit qmake5_paths remove-libtool | 49 | inherit qmake5_paths remove-libtool |
50 | 50 | ||
51 | generate_target_qt_config_file() { | ||
52 | qtconf="$1" | ||
53 | cat > "${qtconf}" <<EOF | ||
54 | [Paths] | ||
55 | Prefix = ${OE_QMAKE_PATH_PREFIX} | ||
56 | Headers = ${OE_QMAKE_PATH_HEADERS} | ||
57 | Libraries = ${OE_QMAKE_PATH_LIBS} | ||
58 | ArchData = ${OE_QMAKE_PATH_ARCHDATA} | ||
59 | Data = ${OE_QMAKE_PATH_DATA} | ||
60 | Binaries = ${OE_QMAKE_PATH_BINS} | ||
61 | LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS} | ||
62 | Plugins = ${OE_QMAKE_PATH_PLUGINS} | ||
63 | Imports = ${OE_QMAKE_PATH_IMPORTS} | ||
64 | Qml2Imports = ${OE_QMAKE_PATH_QML} | ||
65 | Translations = ${OE_QMAKE_PATH_TRANSLATIONS} | ||
66 | Documentation = ${OE_QMAKE_PATH_DOCS} | ||
67 | Settings = ${OE_QMAKE_PATH_SETTINGS} | ||
68 | Examples = ${OE_QMAKE_PATH_EXAMPLES} | ||
69 | Tests = ${OE_QMAKE_PATH_TESTS} | ||
70 | HostBinaries = ${OE_QMAKE_PATH_BINS} | ||
71 | HostData = ${OE_QMAKE_PATH_ARCHDATA} | ||
72 | HostLibraries = ${OE_QMAKE_PATH_LIBS} | ||
73 | HostSpec = ${OE_QMAKE_PLATFORM} | ||
74 | TargetSpec = ${OE_QMAKE_PLATFORM} | ||
75 | ExternalHostBinaries = ${OE_QMAKE_PATH_BINS} | ||
76 | Sysroot = | ||
77 | EOF | ||
78 | } | ||
79 | |||
51 | do_generate_qt_config_file() { | 80 | do_generate_qt_config_file() { |
52 | generate_qt_config_file_paths | 81 | generate_qt_config_file_paths |
53 | generate_qt_config_file_effective_paths | 82 | generate_qt_config_file_effective_paths |
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 201c77d6..9b728c47 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -165,6 +165,10 @@ do_install() { | |||
165 | # Install CMake's toolchain configuration | 165 | # Install CMake's toolchain configuration |
166 | mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ | 166 | mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ |
167 | install -m 644 ${WORKDIR}/OEQt5Toolchain.cmake ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ | 167 | install -m 644 ${WORKDIR}/OEQt5Toolchain.cmake ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ |
168 | |||
169 | # Fix up absolute paths in scripts | ||
170 | grep -lr /usr/bin/python ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \ | ||
171 | xargs -r sed -i -e '1s,#!.*python,#! ${USRBINPATH}/env python,' | ||
168 | } | 172 | } |
169 | 173 | ||
170 | fakeroot do_generate_qt_environment_file() { | 174 | fakeroot do_generate_qt_environment_file() { |
@@ -179,6 +183,7 @@ fakeroot do_generate_qt_environment_file() { | |||
179 | echo 'export OE_QMAKE_CXX=$CXX' >> $script | 183 | echo 'export OE_QMAKE_CXX=$CXX' >> $script |
180 | echo 'export OE_QMAKE_LINK=$CXX' >> $script | 184 | echo 'export OE_QMAKE_LINK=$CXX' >> $script |
181 | echo 'export OE_QMAKE_AR=$AR' >> $script | 185 | echo 'export OE_QMAKE_AR=$AR' >> $script |
186 | echo 'export OE_QMAKE_STRIP=$STRIP' >> $script | ||
182 | echo 'export QT_CONF_PATH=${OE_QMAKE_PATH_HOST_BINS}/qt.conf' >> $script | 187 | echo 'export QT_CONF_PATH=${OE_QMAKE_PATH_HOST_BINS}/qt.conf' >> $script |
183 | echo 'export OE_QMAKE_LIBDIR_QT=`qmake -query QT_INSTALL_LIBS`' >> $script | 188 | echo 'export OE_QMAKE_LIBDIR_QT=`qmake -query QT_INSTALL_LIBS`' >> $script |
184 | echo 'export OE_QMAKE_INCDIR_QT=`qmake -query QT_INSTALL_HEADERS`' >> $script | 189 | echo 'export OE_QMAKE_INCDIR_QT=`qmake -query QT_INSTALL_HEADERS`' >> $script |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 5bbbffeb..aa89280b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -218,9 +218,29 @@ do_install_append() { | |||
218 | -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ | 218 | -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ |
219 | ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri | 219 | ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri |
220 | 220 | ||
221 | # Fix up absolute paths in scripts | 221 | # Update the mkspecs to include the default OE toolchain config for the target |
222 | grep -lr /usr/bin/perl ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \ | 222 | conf=${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/${XPLATFORM}/qmake.conf |
223 | xargs -r sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' | 223 | |
224 | # qmake already knows the sysroot, see above $$[QT_SYSROOT], so remove the hardcoded sysroot | ||
225 | OE_QMAKE_CC_NO_SYSROOT=$(echo ${OE_QMAKE_CC} | sed -e 's!--sysroot=[^ ]*!!g') | ||
226 | OE_QMAKE_CXX_NO_SYSROOT=$(echo ${OE_QMAKE_CXX} | sed -e 's!--sysroot=[^ ]*!!g') | ||
227 | OE_QMAKE_LINK_NO_SYSROOT=$(echo ${OE_QMAKE_LINK} | sed -e 's!--sysroot=[^ ]*!!g') | ||
228 | |||
229 | echo "" >> $conf | ||
230 | echo "# default compiler options which can be overwritten from the environment" >> $conf | ||
231 | echo "isEmpty(QMAKE_AR): QMAKE_AR = ${OE_QMAKE_AR} cqs" >> $conf | ||
232 | echo "isEmpty(QMAKE_CC): QMAKE_CC = $OE_QMAKE_CC_NO_SYSROOT" >> $conf | ||
233 | echo "isEmpty(QMAKE_CFLAGS): QMAKE_CFLAGS = ${OE_QMAKE_CFLAGS}" >> $conf | ||
234 | echo "isEmpty(QMAKE_CXX): QMAKE_CXX = $OE_QMAKE_CXX_NO_SYSROOT" >> $conf | ||
235 | echo "isEmpty(QMAKE_CXXFLAGS): QMAKE_CXXFLAGS = ${OE_QMAKE_CXXFLAGS}" >> $conf | ||
236 | echo "isEmpty(QMAKE_LINK): QMAKE_LINK = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf | ||
237 | echo "isEmpty(QMAKE_LINK_SHLIB): QMAKE_LINK_SHLIB = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf | ||
238 | echo "isEmpty(QMAKE_LINK_C): QMAKE_LINK_C = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf | ||
239 | echo "isEmpty(QMAKE_LINK_C_SHLIB): QMAKE_LINK_C_SHLIB = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf | ||
240 | echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${OE_QMAKE_LDFLAGS}" >> $conf | ||
241 | echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${TARGET_PREFIX}strip" >> $conf | ||
242 | |||
243 | generate_target_qt_config_file ${D}${OE_QMAKE_PATH_BINS}/qt.conf | ||
224 | } | 244 | } |
225 | 245 | ||
226 | # mkspecs have mac specific scripts that depend on perl and bash | 246 | # mkspecs have mac specific scripts that depend on perl and bash |
diff --git a/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch b/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch new file mode 100644 index 00000000..070c8e57 --- /dev/null +++ b/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 896e90350f94654901e88f3365dd54986a6ba1fd Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Mon, 11 Dec 2017 14:39:34 +0200 | ||
4 | Subject: [PATCH] Add missing include for struct timeval | ||
5 | |||
6 | Fix build failure with musl libc: | ||
7 | socketcanbackend.h:88:38: error: 'timeval' was not declared in this scope | ||
8 | |||
9 | Change-Id: I4089f5a906095c21b2790d35ad131d9a0713ff3b | ||
10 | --- | ||
11 | src/plugins/canbus/socketcan/socketcanbackend.h | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h | ||
15 | index 50976b1..b49d267 100644 | ||
16 | --- a/src/plugins/canbus/socketcan/socketcanbackend.h | ||
17 | +++ b/src/plugins/canbus/socketcan/socketcanbackend.h | ||
18 | @@ -50,6 +50,7 @@ | ||
19 | #include <sys/socket.h> | ||
20 | #include <sys/uio.h> | ||
21 | #include <linux/can.h> | ||
22 | +#include <sys/time.h> | ||
23 | |||
24 | QT_BEGIN_NAMESPACE | ||
25 | |||
diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch index bda0ba1a..464c7648 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9bdd03ad0bbb221ad7bffe0e570605c21c28b1b5 Mon Sep 17 00:00:00 2001 | 1 | From 2a3c39550955ed44cfc8410ab2da124c58ca66c0 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] Force host toolchain configuration | 4 | Subject: [PATCH] Force host toolchain configuration |
@@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | |||
18 | 2 files changed, 8 insertions(+), 8 deletions(-) | 18 | 2 files changed, 8 insertions(+), 8 deletions(-) |
19 | 19 | ||
20 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 20 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
21 | index f1b3d47b..12123729 100644 | 21 | index dd0d3e3..70161c8 100644 |
22 | --- a/src/buildtools/configure_host.pro | 22 | --- a/src/buildtools/configure_host.pro |
23 | +++ b/src/buildtools/configure_host.pro | 23 | +++ b/src/buildtools/configure_host.pro |
24 | @@ -4,7 +4,7 @@ TEMPLATE = aux | 24 | @@ -4,7 +4,7 @@ TEMPLATE = aux |
@@ -30,7 +30,7 @@ index f1b3d47b..12123729 100644 | |||
30 | !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH) | 30 | !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH) |
31 | else: GN_TARGET_CPU = $$GN_HOST_CPU | 31 | else: GN_TARGET_CPU = $$GN_HOST_CPU |
32 | GN_OS = $$gnOS() | 32 | GN_OS = $$gnOS() |
33 | @@ -29,9 +29,9 @@ GN_CONTENTS = \ | 33 | @@ -31,9 +31,9 @@ GN_CONTENTS = \ |
34 | "import(\"//build/config/sysroot.gni\")" \ | 34 | "import(\"//build/config/sysroot.gni\")" \ |
35 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ | 35 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ |
36 | "gcc_toolchain(\"host\") {" \ | 36 | "gcc_toolchain(\"host\") {" \ |
@@ -42,8 +42,8 @@ index f1b3d47b..12123729 100644 | |||
42 | +" ld = \"$$which(g++)\" " \ | 42 | +" ld = \"$$which(g++)\" " \ |
43 | " ar = \"$$which(ar)\" " \ | 43 | " ar = \"$$which(ar)\" " \ |
44 | " nm = \"$$which(nm)\" " \ | 44 | " nm = \"$$which(nm)\" " \ |
45 | " toolchain_args = { " \ | 45 | " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ |
46 | @@ -42,9 +42,9 @@ GN_CONTENTS = \ | 46 | @@ -45,9 +45,9 @@ GN_CONTENTS = \ |
47 | " } " \ | 47 | " } " \ |
48 | "}" \ | 48 | "}" \ |
49 | "gcc_toolchain(\"v8_snapshot\") {" \ | 49 | "gcc_toolchain(\"v8_snapshot\") {" \ |
@@ -57,10 +57,10 @@ index f1b3d47b..12123729 100644 | |||
57 | " nm = \"$$which(nm)\" " \ | 57 | " nm = \"$$which(nm)\" " \ |
58 | " toolchain_args = { " \ | 58 | " toolchain_args = { " \ |
59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | 59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri |
60 | index 714c864d..f66ca551 100644 | 60 | index 6f7b27f..1b9434b 100644 |
61 | --- a/src/core/config/linux.pri | 61 | --- a/src/core/config/linux.pri |
62 | +++ b/src/core/config/linux.pri | 62 | +++ b/src/core/config/linux.pri |
63 | @@ -98,7 +98,7 @@ contains(QT_ARCH, "mips"):!host_build { | 63 | @@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") { |
64 | 64 | ||
65 | host_build { | 65 | host_build { |
66 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | 66 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" |
diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index bf1f1891..1e187956 100644 --- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | |||
@@ -1,19 +1,41 @@ | |||
1 | From e695f37fc52defd1b96664b003444692e9b6cb65 Mon Sep 17 00:00:00 2001 | 1 | From f6c6a5522f006b14c4d9c4daa23f96c4e8e65a32 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 | 3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 |
4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux | 4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | --- |
8 | chromium/base/process/process_metrics_posix.cc | 4 ++-- | ||
8 | chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- | 9 | chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- |
9 | chromium/content/child/content_child_helpers.cc | 2 +- | 10 | chromium/content/child/content_child_helpers.cc | 2 +- |
10 | 2 files changed, 3 insertions(+), 2 deletions(-) | 11 | 3 files changed, 5 insertions(+), 4 deletions(-) |
11 | 12 | ||
13 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc | ||
14 | index 0eb5c1f..8af7799 100644 | ||
15 | --- a/chromium/base/process/process_metrics_posix.cc | ||
16 | +++ b/chromium/base/process/process_metrics_posix.cc | ||
17 | @@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() { | ||
18 | malloc_statistics_t stats = {0}; | ||
19 | malloc_zone_statistics(nullptr, &stats); | ||
20 | return stats.size_in_use; | ||
21 | -#elif defined(OS_LINUX) || defined(OS_ANDROID) | ||
22 | +#elif defined(__GLIBC__) || defined(OS_ANDROID) | ||
23 | struct mallinfo minfo = mallinfo(); | ||
24 | #if defined(USE_TCMALLOC) | ||
25 | return minfo.uordblks; | ||
26 | #else | ||
27 | return minfo.hblkhd + minfo.arena; | ||
28 | #endif | ||
29 | -#elif defined(OS_FUCHSIA) | ||
30 | +#else | ||
31 | // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. | ||
32 | return 0; | ||
33 | #endif | ||
12 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc | 34 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc |
13 | index 7d0cb57931..10be59ebad 100644 | 35 | index 14ba0a2..e5d9581 100644 |
14 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | 36 | --- a/chromium/base/trace_event/malloc_dump_provider.cc |
15 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | 37 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc |
16 | @@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {} | 38 | @@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() {} |
17 | // the current process. | 39 | // the current process. |
18 | bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | 40 | bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, |
19 | ProcessMemoryDump* pmd) { | 41 | ProcessMemoryDump* pmd) { |
@@ -21,7 +43,7 @@ index 7d0cb57931..10be59ebad 100644 | |||
21 | size_t total_virtual_size = 0; | 43 | size_t total_virtual_size = 0; |
22 | size_t resident_size = 0; | 44 | size_t resident_size = 0; |
23 | size_t allocated_objects_size = 0; | 45 | size_t allocated_objects_size = 0; |
24 | @@ -321,7 +322,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | 46 | @@ -317,7 +318,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, |
25 | pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); | 47 | pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); |
26 | } | 48 | } |
27 | tid_dumping_heap_ = kInvalidThreadId; | 49 | tid_dumping_heap_ = kInvalidThreadId; |
@@ -31,7 +53,7 @@ index 7d0cb57931..10be59ebad 100644 | |||
31 | } | 53 | } |
32 | 54 | ||
33 | diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc | 55 | diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc |
34 | index 7ddeb4d16a..b8c73b09c5 100644 | 56 | index 7ddeb4d..b8c73b0 100644 |
35 | --- a/chromium/content/child/content_child_helpers.cc | 57 | --- a/chromium/content/child/content_child_helpers.cc |
36 | +++ b/chromium/content/child/content_child_helpers.cc | 58 | +++ b/chromium/content/child/content_child_helpers.cc |
37 | @@ -25,7 +25,7 @@ namespace content { | 59 | @@ -25,7 +25,7 @@ namespace content { |
diff --git a/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch new file mode 100644 index 00000000..38fa8729 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 0fd704beb18948577e793b73c569dc933c478f2e Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Tue, 12 Dec 2017 16:06:14 +0200 | ||
4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl | ||
5 | |||
6 | Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 | ||
7 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
8 | --- | ||
9 | src/core/api/qtbug-61521.cpp | 8 -------- | ||
10 | 1 file changed, 8 deletions(-) | ||
11 | |||
12 | diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp | ||
13 | index 002a1af..8fd2da3 100644 | ||
14 | --- a/src/core/api/qtbug-61521.cpp | ||
15 | +++ b/src/core/api/qtbug-61521.cpp | ||
16 | @@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); | ||
17 | void* __valloc(size_t size) | ||
18 | SHIM_ALIAS_SYMBOL(ShimValloc); | ||
19 | |||
20 | -SHIM_SYMBOL_VERSION(pvalloc); | ||
21 | -void* __pvalloc(size_t size) | ||
22 | - SHIM_ALIAS_SYMBOL(ShimPvalloc); | ||
23 | - | ||
24 | SHIM_SYMBOL_VERSION(posix_memalign); | ||
25 | int __posix_memalign(void** r, size_t a, size_t s) | ||
26 | SHIM_ALIAS_SYMBOL(ShimPosixMemalign); | ||
27 | @@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) { | ||
28 | return valloc(size); | ||
29 | } | ||
30 | |||
31 | -SHIM_HIDDEN void* ShimPvalloc(size_t size) { | ||
32 | - return pvalloc(size); | ||
33 | -} | ||
34 | - | ||
35 | SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { | ||
36 | return posix_memalign(r,a,s); | ||
37 | } | ||
diff --git a/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch new file mode 100644 index 00000000..cabc598e --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 59fd9db95db829e51840df09962f7c6baf484246 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Thu, 14 Dec 2017 11:28:10 +0200 | ||
4 | Subject: [PATCH] musl: link against libexecinfo | ||
5 | |||
6 | Change-Id: Ifada60f9c72691973612850121f6fb152d70839a | ||
7 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
8 | --- | ||
9 | src/core/core_module.pro | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/core/core_module.pro b/src/core/core_module.pro | ||
13 | index 2409ccb..e41e5a9 100644 | ||
14 | --- a/src/core/core_module.pro | ||
15 | +++ b/src/core/core_module.pro | ||
16 | @@ -45,7 +45,7 @@ else: QMAKE_LFLAGS += $$NINJA_LFLAGS | ||
17 | POST_TARGETDEPS += $$NINJA_TARGETDEPS | ||
18 | |||
19 | |||
20 | -LIBS_PRIVATE += -L$$api_library_path | ||
21 | +LIBS_PRIVATE += -L$$api_library_path -lexecinfo | ||
22 | CONFIG *= no_smart_library_merge | ||
23 | osx { | ||
24 | LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a | ||
diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch index 7a778c22..d6de1c00 100644 --- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d0621f9278ddd04c05b6ab3ef638be65f96f1bd6 Mon Sep 17 00:00:00 2001 | 1 | From 2ed7538fb95ce3bb8a5917c648e2361f85b9c67b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 | 3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 |
4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction | 4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction |
@@ -9,12 +9,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc | 11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc |
12 | index 5a0564d2f3..8c2dc6491d 100644 | 12 | index 9cd5d22..1e70095 100644 |
13 | --- a/chromium/base/allocator/allocator_check.cc | 13 | --- a/chromium/base/allocator/allocator_check.cc |
14 | +++ b/chromium/base/allocator/allocator_check.cc | 14 | +++ b/chromium/base/allocator/allocator_check.cc |
15 | @@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { | 15 | @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { |
16 | #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) | 16 | // Set by allocator_shim_override_ucrt_symbols_win.h when the |
17 | // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. | 17 | // shimmed _set_new_mode() is called. |
18 | return g_is_win_shim_layer_initialized; | 18 | return g_is_win_shim_layer_initialized; |
19 | -#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ | 19 | -#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ |
20 | +#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ | 20 | +#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ |
diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch index f1cc205b..652b89ec 100644 --- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -1,16 +1,16 @@ | |||
1 | From 72a77c994434ecb708b2790ba9efaf1decc02503 Mon Sep 17 00:00:00 2001 | 1 | From d42b48975e92cfc4510030315ad8093bece4b7c5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 | 3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 |
4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size | 4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | --- |
8 | chromium/base/threading/platform_thread_linux.cc | 3 ++- | 8 | chromium/base/threading/platform_thread_linux.cc | 3 ++- |
9 | chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- | 9 | chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | 4 ++-- |
10 | 2 files changed, 4 insertions(+), 3 deletions(-) | 10 | 2 files changed, 4 insertions(+), 3 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | 12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc |
13 | index 92fbda5ee1..c41579d4ed 100644 | 13 | index 8d411ed..4b56cf3 100644 |
14 | --- a/chromium/base/threading/platform_thread_linux.cc | 14 | --- a/chromium/base/threading/platform_thread_linux.cc |
15 | +++ b/chromium/base/threading/platform_thread_linux.cc | 15 | +++ b/chromium/base/threading/platform_thread_linux.cc |
16 | @@ -175,7 +175,8 @@ void TerminateOnThread() {} | 16 | @@ -175,7 +175,8 @@ void TerminateOnThread() {} |
@@ -23,25 +23,25 @@ index 92fbda5ee1..c41579d4ed 100644 | |||
23 | #else | 23 | #else |
24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the | 24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the |
25 | // default stack size isn't enough for some browser tests. | 25 | // default stack size isn't enough for some browser tests. |
26 | diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 26 | diff --git a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp |
27 | index 1d164f510a..3358deb256 100644 | 27 | index 13c3f90..07308e0 100644 |
28 | --- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 28 | --- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp |
29 | +++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 29 | +++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp |
30 | @@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { | 30 | @@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { |
31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size | 31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size |
32 | // correctly for the main thread. | 32 | // correctly for the main thread. |
33 | 33 | ||
34 | -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) | 34 | -#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
35 | +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) | 35 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
36 | defined(OS_FUCHSIA) | ||
36 | // pthread_getattr_np() can fail if the thread is not invoked by | 37 | // pthread_getattr_np() can fail if the thread is not invoked by |
37 | // pthread_create() (e.g., the main thread of webkit_unit_tests). | 38 | // pthread_create() (e.g., the main thread of webkit_unit_tests). |
38 | // If so, a conservative size estimate is returned. | 39 | @@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() { |
39 | @@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { | ||
40 | } | 40 | } |
41 | 41 | ||
42 | void* StackFrameDepth::getStackStart() { | 42 | void* GetStackStart() { |
43 | -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) | 43 | -#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
44 | +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) | 44 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
45 | defined(OS_FUCHSIA) | ||
45 | pthread_attr_t attr; | 46 | pthread_attr_t attr; |
46 | int error; | 47 | int error; |
47 | #if OS(FREEBSD) | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 100458aa..214b9ac3 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -139,6 +139,8 @@ SRC_URI += " \ | |||
139 | " | 139 | " |
140 | 140 | ||
141 | SRC_URI_append_libc-musl = "\ | 141 | SRC_URI_append_libc-musl = "\ |
142 | file://0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ | ||
143 | file://0006-musl-link-against-libexecinfo.patch \ | ||
142 | file://0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ | 144 | file://0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ |
143 | file://0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ | 145 | file://0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ |
144 | file://0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ | 146 | file://0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ |
diff --git a/recipes-qt/qwt/qwt-qt5.inc b/recipes-qt/qwt/qwt-qt5.inc deleted file mode 100644 index f3ece399..00000000 --- a/recipes-qt/qwt/qwt-qt5.inc +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | DESCRIPTION = "Qt Widget Extension for Technical Applications" | ||
2 | SECTION = "libs" | ||
3 | |||
4 | # LGPLv2.1 + some exceptions | ||
5 | LICENSE = "QWTv1.0" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" | ||
7 | |||
8 | DEPENDS = "qtbase qtsvg qttools" | ||
9 | |||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ | ||
11 | file://remove_rpath.patch \ | ||
12 | " | ||
13 | |||
14 | S = "${WORKDIR}/qwt-${PV}" | ||
15 | |||
16 | do_configure_prepend() { | ||
17 | cd ${S} | ||
18 | sed -i -e 's:RELEASE_SUFFIX = :RELEASE_SUFFIX = ${QT_LIBINFIX}:' *.pri | ||
19 | sed -i -e 's:qtAddLibrary(qwt:qtAddLibrary(qwt)${QT_LIBINFIX}:g' *.prf | ||
20 | sed -e 's/# QWT_CONFIG += QwtExamples/QWT_CONFIG += QwtExamples/g' -i qwtconfig.pri | ||
21 | sed -i -e 's:/usr/local/qwt-$$QWT_VERSION:${D}${prefix}:g' ${S}/*.pri | ||
22 | } | ||
23 | |||
24 | do_install() { | ||
25 | cd ${S} | ||
26 | oe_runmake -e install | ||
27 | # install -d ${D}${datadir}/doc/${PN} | ||
28 | # mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/ | ||
29 | # rmdir ${D}${prefix}/doc | ||
30 | # cd ${S}/examples | ||
31 | # install -d ${D}/${bindir} | ||
32 | # cd bin${QT_LIBINFIX}/ | ||
33 | # for i in * ; do | ||
34 | # cp -pPR ${i} ${D}/${bindir}/${i}${QT_LIBINFIX} | ||
35 | # done | ||
36 | # install -d ${D}${libdir}/${QT_DIR_NAME} | ||
37 | # mv ${D}${prefix}/plugins ${D}${libdir}/${QT_DIR_NAME} | ||
38 | } | ||
39 | |||
40 | PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " | ||
41 | FILES_${PN}-examples = "${bindir}/*" | ||
42 | FILES_${PN}-features = "${prefix}/features" | ||
43 | FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" | ||
44 | FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug" | ||
45 | FILES_${PN}-doc += "${prefix}/doc" | ||
46 | |||
47 | INSANE_SKIP_${PN}-plugins += "libdir" | ||
48 | INSANE_SKIP_${PN}-dbg += "libdir" | ||
diff --git a/recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch b/recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch new file mode 100644 index 00000000..fa63c347 --- /dev/null +++ b/recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From ff950c71bf841a4d62952aac72f3c5a830cf9cff Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Wed, 29 Nov 2017 22:31:07 +0100 | ||
4 | Subject: [PATCH] Remove rpath from binaries - they point to buuild area | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | This is a rework of the patch submitted by Khem Raj. | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE specific] | ||
12 | |||
13 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
14 | --- | ||
15 | designer/designer.pro | 1 - | ||
16 | examples/examples.pri | 1 - | ||
17 | playground/playground.pri | 1 - | ||
18 | qwt.prf | 1 - | ||
19 | 4 files changed, 4 deletions(-) | ||
20 | |||
21 | diff --git a/designer/designer.pro b/designer/designer.pro | ||
22 | index 7d44a44..a11847d 100644 | ||
23 | --- a/designer/designer.pro | ||
24 | +++ b/designer/designer.pro | ||
25 | @@ -83,7 +83,6 @@ contains(QWT_CONFIG, QwtDesigner) { | ||
26 | # compile the path for finding the Qwt library | ||
27 | # into the plugin. Not supported on Windows ! | ||
28 | |||
29 | - QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} | ||
30 | qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) | ||
31 | |||
32 | contains(QWT_CONFIG, QwtDll) { | ||
33 | diff --git a/examples/examples.pri b/examples/examples.pri | ||
34 | index 200b188..b7776a8 100644 | ||
35 | --- a/examples/examples.pri | ||
36 | +++ b/examples/examples.pri | ||
37 | @@ -34,7 +34,6 @@ else { | ||
38 | } | ||
39 | } | ||
40 | |||
41 | -QMAKE_RPATHDIR *= $${QWT_OUT_ROOT}/lib | ||
42 | qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) | ||
43 | |||
44 | greaterThan(QT_MAJOR_VERSION, 4) { | ||
45 | diff --git a/playground/playground.pri b/playground/playground.pri | ||
46 | index c544360..fd0275f 100644 | ||
47 | --- a/playground/playground.pri | ||
48 | +++ b/playground/playground.pri | ||
49 | @@ -35,7 +35,6 @@ else { | ||
50 | } | ||
51 | |||
52 | |||
53 | -QMAKE_RPATHDIR *= $${QWT_ROOT}/lib | ||
54 | qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) | ||
55 | |||
56 | greaterThan(QT_MAJOR_VERSION, 4) { | ||
57 | diff --git a/qwt.prf b/qwt.prf | ||
58 | index 2625b31..7860153 100644 | ||
59 | --- a/qwt.prf | ||
60 | +++ b/qwt.prf | ||
61 | @@ -33,5 +33,4 @@ else { | ||
62 | INCLUDEPATH *= $${QWT_INSTALL_HEADERS} | ||
63 | } | ||
64 | |||
65 | -# QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} | ||
66 | qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt) | ||
67 | -- | ||
68 | 2.9.5 | ||
69 | |||
diff --git a/recipes-qt/qwt/qwt-qt5/remove_rpath.patch b/recipes-qt/qwt/qwt-qt5/remove_rpath.patch deleted file mode 100644 index 14b65d6a..00000000 --- a/recipes-qt/qwt/qwt-qt5/remove_rpath.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Remove rpath from library, it points to build area which is not | ||
2 | ok | ||
3 | |||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Index: qwt-6.1.3/designer/designer.pro | ||
7 | =================================================================== | ||
8 | --- qwt-6.1.3.orig/designer/designer.pro | ||
9 | +++ qwt-6.1.3/designer/designer.pro | ||
10 | @@ -83,7 +83,6 @@ contains(QWT_CONFIG, QwtDesigner) { | ||
11 | # compile the path for finding the Qwt library | ||
12 | # into the plugin. Not supported on Windows ! | ||
13 | |||
14 | - QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} | ||
15 | qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) | ||
16 | |||
17 | contains(QWT_CONFIG, QwtDll) { | ||
diff --git a/recipes-qt/qwt/qwt-qt5_6.1.3.bb b/recipes-qt/qwt/qwt-qt5_6.1.3.bb index 626bd0ab..1c6e10b7 100644 --- a/recipes-qt/qwt/qwt-qt5_6.1.3.bb +++ b/recipes-qt/qwt/qwt-qt5_6.1.3.bb | |||
@@ -1,8 +1,49 @@ | |||
1 | inherit qmake5 | 1 | SUMMARY = "Qt Widget Extension for Technical Applications" |
2 | SECTION = "libs" | ||
3 | HOMEPAGE = "http://qwt.sourceforge.net/index.html" | ||
4 | |||
5 | # LGPLv2.1 + some exceptions | ||
6 | LICENSE = "QWTv1.0" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" | ||
8 | |||
9 | DEPENDS = "qtbase qtsvg qttools" | ||
2 | 10 | ||
3 | require qwt-qt5.inc | 11 | inherit qmake5 |
4 | 12 | ||
13 | SRC_URI = " \ | ||
14 | ${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ | ||
15 | file://0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch \ | ||
16 | " | ||
5 | SRC_URI[qwt.md5sum] = "19d1f5fa5e22054d22ee3accc37c54ba" | 17 | SRC_URI[qwt.md5sum] = "19d1f5fa5e22054d22ee3accc37c54ba" |
6 | SRC_URI[qwt.sha256sum] = "f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733" | 18 | SRC_URI[qwt.sha256sum] = "f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733" |
7 | 19 | ||
20 | S = "${WORKDIR}/qwt-${PV}" | ||
21 | |||
22 | EXTRA_QMAKEVARS_PRE += " \ | ||
23 | QWT_CONFIG+=QwtPkgConfig \ | ||
24 | QWT_CONFIG+=QwtExamples \ | ||
25 | " | ||
26 | |||
27 | do_configure_prepend() { | ||
28 | sed -i 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' ${S}/*.pri | ||
29 | } | ||
30 | |||
31 | do_install_append() { | ||
32 | # seems out of tree build confuses installation of examples | ||
33 | # so install them manually | ||
34 | install -d ${D}${bindir}/ | ||
35 | cp ${B}/examples/bin/* ${D}${bindir}/ | ||
36 | } | ||
37 | |||
38 | |||
39 | PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " | ||
40 | FILES_${PN}-examples = "${bindir}/*" | ||
41 | FILES_${PN}-features = "${prefix}/features" | ||
42 | FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" | ||
43 | FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug" | ||
44 | FILES_${PN}-doc += "${prefix}/doc" | ||
45 | |||
46 | INSANE_SKIP_${PN}-plugins += "libdir" | ||
47 | INSANE_SKIP_${PN}-dbg += "libdir" | ||
48 | |||
8 | RPROVIDES_${PN}-dev = "libqwt-qt5-dev" | 49 | RPROVIDES_${PN}-dev = "libqwt-qt5-dev" |