summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-14 10:56:32 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-14 10:56:32 +0100
commita7ed1887b82ee27c9ae6aef39a4a5067195fd129 (patch)
tree6effb517fef6b5bf770080da8343b4e7185ec8fc
parent91964e64690d7c69db8a9f2cd0cb0110f1089e05 (diff)
parentbdc9eb3b8a48315fe5df4fabb0ca53b98bbc1808 (diff)
Merge remote-tracking branch 'agl/sandbox/locust2001/rocko' into HEAD
* agl/sandbox/locust2001/rocko: ninja,harfbuzz: Remove .bbappend libdbus-c++:Fix build error in GCC-7 qtbase: Remove -no-use-gold-linker option unicens-config: Add bash to rdeps libdbus-c++: Remove bbappend file opencv: Rename .bbappend to match new version from meta-openembedded Bug-AGL: SPEC-1181 Change-Id: I0fc0ee1e50dc20b57b943b7128d157d51eb9cafa Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rw-r--r--recipes-config/unicens-config/unicens-config.bb3
-rw-r--r--recipes-core/dbus/libdbus-c++/dbus-c++-threading.patch45
-rw-r--r--recipes-core/dbus/libdbus-c++_0.9.0.bbappend3
-rw-r--r--recipes-devtools/ninja/ninja_%.bbappend2
-rw-r--r--recipes-graphics/harfbuzz/harfbuzz_%.bbappend1
-rw-r--r--recipes-qt/qt5/qtbase_%.bbappend3
-rw-r--r--recipes-support/opencv/opencv_3.3.bbappend (renamed from recipes-support/opencv/opencv_3.2.bbappend)0
7 files changed, 50 insertions, 7 deletions
diff --git a/recipes-config/unicens-config/unicens-config.bb b/recipes-config/unicens-config/unicens-config.bb
index 706b2c87e..f33ffb295 100644
--- a/recipes-config/unicens-config/unicens-config.bb
+++ b/recipes-config/unicens-config/unicens-config.bb
@@ -2,11 +2,14 @@ DESCRIPTION = "Configure MOST driver"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+RDEPENDS_${PN} = "bash"
+
SRC_URI = "\
file://unicens-config.service \
file://unicens-config.sh \
"
+
inherit systemd
SYSTEMD_PACKAGES = "${PN}"
diff --git a/recipes-core/dbus/libdbus-c++/dbus-c++-threading.patch b/recipes-core/dbus/libdbus-c++/dbus-c++-threading.patch
new file mode 100644
index 000000000..c4fafef62
--- /dev/null
+++ b/recipes-core/dbus/libdbus-c++/dbus-c++-threading.patch
@@ -0,0 +1,45 @@
+--- libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h.threading 2017-02-15 13:40:53.796004263 +0000
++++ libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h 2017-02-15 13:40:46.907000493 +0000
+@@ -188,6 +188,7 @@
+ /* classes for multithreading support
+ */
+
++#if 0
+ class DXXAPI Mutex
+ {
+ public:
+@@ -243,9 +244,11 @@
+ typedef bool (*CondVarWaitTimeoutFn)(CondVar *cv, Mutex *mx, int timeout);
+ typedef void (*CondVarWakeOneFn)(CondVar *cv);
+ typedef void (*CondVarWakeAllFn)(CondVar *cv);
++#endif
+
+ void DXXAPI _init_threading();
+
++#if 0
+ void DXXAPI _init_threading(
+ MutexNewFn, MutexFreeFn, MutexLockFn, MutexUnlockFn,
+ CondVarNewFn, CondVarFreeFn, CondVarWaitFn, CondVarWaitTimeoutFn, CondVarWakeOneFn, CondVarWakeAllFn
+@@ -312,6 +315,7 @@
+ cv->wake_all();
+ }
+ };
++#endif
+
+ } /* namespace DBus */
+
+--- libdbus-c++-0.9.0/src/dispatcher.cpp.threading 2017-02-15 13:48:22.627249868 +0000
++++ libdbus-c++-0.9.0/src/dispatcher.cpp 2017-02-15 13:48:29.164253445 +0000
+@@ -253,6 +253,7 @@
+ #endif//DBUS_HAS_THREADS_INIT_DEFAULT
+ }
+
++#if 0
+ void DBus::_init_threading(
+ MutexNewFn m1,
+ MutexFreeFn m2,
+@@ -318,3 +319,4 @@
+ #endif//DBUS_HAS_RECURSIVE_MUTEX
+ dbus_threads_init(&functions);
+ }
++#endif
diff --git a/recipes-core/dbus/libdbus-c++_0.9.0.bbappend b/recipes-core/dbus/libdbus-c++_0.9.0.bbappend
index ea83587ae..dac44b5e6 100644
--- a/recipes-core/dbus/libdbus-c++_0.9.0.bbappend
+++ b/recipes-core/dbus/libdbus-c++_0.9.0.bbappend
@@ -1 +1,2 @@
-PNBLACKLIST[libdbus-c++] = ""
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+SRC_URI_append = "file://dbus-c++-threading.patch"
diff --git a/recipes-devtools/ninja/ninja_%.bbappend b/recipes-devtools/ninja/ninja_%.bbappend
deleted file mode 100644
index efc347a71..000000000
--- a/recipes-devtools/ninja/ninja_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-BBCLASSEXTEND += "nativesdk"
-
diff --git a/recipes-graphics/harfbuzz/harfbuzz_%.bbappend b/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
deleted file mode 100644
index 7ac439a25..000000000
--- a/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG_append = " icu"
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
index 203b3264b..d568b1284 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/recipes-qt/qt5/qtbase_%.bbappend
@@ -14,6 +14,3 @@ EXTRA_OECONF_append = ""
# '-qpa wayland-egl' set wayland-egl as default of platform plagins
PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard"
-
-# Temporarily fix bug due to binutils 2.28
-QT_CONFIG_FLAGS_append = " -no-use-gold-linker"
diff --git a/recipes-support/opencv/opencv_3.2.bbappend b/recipes-support/opencv/opencv_3.3.bbappend
index 8656abf09..8656abf09 100644
--- a/recipes-support/opencv/opencv_3.2.bbappend
+++ b/recipes-support/opencv/opencv_3.3.bbappend