[oe] [meta-oe][PATCH v2] asio: fix musl compilation (strerror_r)
Cherry picked upstream commit
Signed-off-by: André Draszik
---
...ly-handle-glibc-variant-of-strerror_r-wit.patch | 46 ++
meta-oe/recipes-support/asio/asio_1.10.6.bb| 2 +
2 files changed, 48 insertions(+)
create mode 100644
meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch
diff --git
a/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch
b/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch
new file mode 100644
index 000..4244b97
--- /dev/null
+++
b/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch
@@ -0,0 +1,46 @@
+From 45c855400842fd40f200ae9b7abf9debf4ab5436 Mon Sep 17 00:00:00 2001
+From: Christopher Kohlhoff
+Date: Sun, 28 Aug 2016 09:21:53 +1000
+Subject: [PATCH] Automatically handle glibc variant of strerror_r without
+ #ifdefs.
+
+---
+Upstream-Status: Backport
https://github.com/chriskohlhoff/asio/commit/443bc17d13eb5e37de780ea6e23157493cf7b3b9
+ include/asio/impl/error_code.ipp | 16 +++-
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/include/asio/impl/error_code.ipp
b/include/asio/impl/error_code.ipp
+index ccb70dd..a117658 100644
+--- a/include/asio/impl/error_code.ipp
b/include/asio/impl/error_code.ipp
+@@ -97,20 +97,18 @@ public:
+ #if defined(__sun) || defined(__QNX__) || defined(__SYMBIAN32__)
+ using namespace std;
+ return strerror(value);
+-#elif defined(__MACH__) && defined(__APPLE__) \
+- || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) \
+- || defined(_AIX) || defined(__hpux) || defined(__osf__) \
+- || defined(__ANDROID__)
+-char buf[256] = "";
+-using namespace std;
+-strerror_r(value, buf, sizeof(buf));
+-return buf;
+ #else
+ char buf[256] = "";
+-return strerror_r(value, buf, sizeof(buf));
++using namespace std;
++return strerror_result(strerror_r(value, buf, sizeof(buf)), buf);
+ #endif
+ #endif // defined(ASIO_WINDOWS)
+ }
++
++private:
++ // Helper function to adapt the result from glibc's variant of strerror_r.
++ static const char* strerror_result(int, const char* s) { return s; }
++ static const char* strerror_result(const char* s, const char*) { return s; }
+ };
+
+ } // namespace detail
+--
+2.9.3
+
diff --git a/meta-oe/recipes-support/asio/asio_1.10.6.bb
b/meta-oe/recipes-support/asio/asio_1.10.6.bb
index db4ae80..d6f4ddd 100644
--- a/meta-oe/recipes-support/asio/asio_1.10.6.bb
+++ b/meta-oe/recipes-support/asio/asio_1.10.6.bb
@@ -4,3 +4,5 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=fede5286a78559dd646e355ab0cc8f04"
SRC_URI[md5sum] = "85d014a356a6e004cd30ccd4c9b6a5c2"
SRC_URI[sha256sum] =
"e0d71c40a7b1f6c1334008fb279e7361b32a063e020efd21e40d9d8ff037195e"
+
+SRC_URI +=
"file://0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch"
--
2.9.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtdeclarative: add upstream patch to fix QtQml crash with GCC 6
Signed-off-by: Jonathan Liu
---
...crashes-in-QtQml-code-related-to-dead-sto.patch | 44 ++
recipes-qt/qt5/qtdeclarative_git.bb| 1 +
2 files changed, 45 insertions(+)
create mode 100644
recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch
diff --git
a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch
b/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch
new file mode 100644
index 000..d3ee42e
--- /dev/null
+++
b/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch
@@ -0,0 +1,44 @@
+From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001
+From: Jonathan Liu
+Date: Wed, 24 Aug 2016 11:18:37 +1000
+Subject: [PATCH] Workaround crashes in QtQml code related to dead-store
+ elimination
+
+When compiled in release mode with GCC 6, QtQml may crash.
+This is because the C++ compiler is more aggressive about dead-store
+elimination in situations where a memory store to a location precedes
+the construction of an object at that memory location.
+
+The QV4::MemoryManager::allocate{Managed,Object} functions allocate
+memory and write to it before the caller does a placement new to
+construct an object in the same memory. The compiler considers these
+writes before the constructor as "dead stores" and eliminates them.
+
+The -fno-lifetime-dse compiler flag is added to disable this more
+aggressive dead-store eliminiation optimization.
+
+This is a temporary workaround until a proper solution is found.
+
+Upstream-Status: Accepted
+
+Task-number: QTBUG-55482
+Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5
+Reviewed-by: Thiago Macieira
+Signed-off-by: Jonathan Liu
+---
+ src/qml/qml.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qml/qml.pro b/src/qml/qml.pro
+index f4862a1..651afa6 100644
+--- a/src/qml/qml.pro
b/src/qml/qml.pro
+@@ -18,7 +18,7 @@ exists("qqml_enable_gcov") {
+
+ greaterThan(QT_GCC_MAJOR_VERSION, 5) {
+ # Our code is bad. Temporary workaround.
+-QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
++QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse
+ }
+
+ QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb
b/recipes-qt/qt5/qtdeclarative_git.bb
index 4a690cb..5cc4caa 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -19,6 +19,7 @@ DEPENDS += "qtbase"
SRC_URI += " \
file://0001-qmltestexample-fix-link.patch \
file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \
+file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \
"
EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt"
--
2.9.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5] the QV4 engine will crash result in SIGSEGV
Hi Khem, On 26 August 2016 at 03:00, Khem Raj wrote: > >> On Aug 25, 2016, at 12:45 AM, Yi Qingliang wrote: >> >> bug detail: >> https://bugs.archlinux.org/task/49723 >> >> patch: >> https://git.archlinux.org/svntogit/packages.git/tree/trunk/qt5-declarative-gcc6.patch?h=packages/qt5-declarative >> > > Thanks for report. Would it be possible for you to cook up a patch for > meta-qt5 layer for this ? I have fixed this in Qt 5 upstream and submitted a patch for meta-qt5 to the mailing list. Regards, Jonathan -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5] the QV4 engine will crash result in SIGSEGV
On Aug 29, 2016 5:44 AM, "Jonathan Liu" wrote: > > Hi Khem, > > On 26 August 2016 at 03:00, Khem Raj wrote: > > > >> On Aug 25, 2016, at 12:45 AM, Yi Qingliang wrote: > >> > >> bug detail: > >> https://bugs.archlinux.org/task/49723 > >> > >> patch: > >> https://git.archlinux.org/svntogit/packages.git/tree/trunk/qt5-declarative-gcc6.patch?h=packages/qt5-declarative > >> > > > > Thanks for report. Would it be possible for you to cook up a patch for meta-qt5 layer for this ? > > I have fixed this in Qt 5 upstream and submitted a patch for meta-qt5 > to the mailing list. Thank you > > Regards, > Jonathan -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] geany-plugins: include GPLv3 in the main LICENSE
* since last changes in oe-core LICENSE variable needs to list all licenses used by individual packages otherwise bitbake warning like this is shown: WARNING: meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.27.bb: LICENSE_geany-plugins-commander includes licenses (GPLv3) that are not listed in LICENSE as possible improvement you can set LICENSE to GPLv2 to all plugins which are GPLv2-only, because now they will "inherit" both GPLv2 & GPLv3 which sucks as described here: https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg81645.html Signed-off-by: Martin Jansa --- meta-oe/recipes-devtools/geany/geany-plugins_1.27.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.27.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.27.bb index 9a39150..5e1e721 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.27.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.27.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A fast and lightweight IDE" HOMEPAGE = "http://plugins.geany.org/"; # majority's default -LICENSE = "GPLv2" +LICENSE = "GPLv2 & GPLv3" DEPENDS = "geany lua libxml2 libsoup-2.4 vte enchant intltool-native libassuan gpgme" -- 2.9.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] geany-plugins: include GPLv3 in the main LICENSE
On Mon, Aug 29, 2016 at 1:52 PM, Martin Jansa wrote: > * since last changes in oe-core LICENSE variable needs to list all > licenses used > by individual packages otherwise bitbake warning like this is shown: > WARNING: meta-openembedded/meta-oe/recipes-devtools/geany/geany- > plugins_1.27.bb: LICENSE_geany-plugins-commander includes licenses > (GPLv3) that are not listed in LICENSE > as possible improvement you can set LICENSE to GPLv2 to all plugins > which are GPLv2-only, because now they will "inherit" both GPLv2 & > GPLv3 which sucks as described here: > https://www.mail-archive.com/openembedded-core@lists. > openembedded.org/msg81645.html > > Signed-off-by: Martin Jansa > Would be nice if we had a general way to change the inherited LICENSE as used by the binary packages. Adding a single indirection to package.bbclass to default to LICENSE_DEFAULT rather than LICENSE and defaulting LICENSE_DEFAULT to LICENSE would do (or similar), then this recipe could set LICENSE_DEFAULT to GPLv2. In the meantime.. We have a bbappend in meta-mentor for this on a branch which handles it for this recipe reasonably, I think: https://github.com/MentorEmbedded/meta-mentor/pull/843/commits/d852857 -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe] [PATCH] imagemagick: update patchset
Fixed:
ERROR: imagemagick-7.0.2-r0 do_fetch: Fetcher failure:
--2016-08-28 04:07:12--
http://www.imagemagick.org/download/releases/ImageMagick-7.0.2-7.tar.xz
Resolving www.imagemagick.org... 198.72.81.86
Connecting to www.imagemagick.org|198.72.81.86|:80... connected.
HTTP request sent, awaiting response... 404 Not Found
2016-08-28 04:07:12 ERROR 404: Not Found.
Signed-off-by: Robert Yang
---
meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
index 472e42d..5937062 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
@@ -8,11 +8,12 @@ DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib
virtual/fftw freetype"
# Important note: tarballs for all patchsets within a version are deleted when
# a new pachset is created. To avoid multiple patches for each patchset, try to
# update to the last pachset of a version
-PATCHSET = "7"
+PATCHSET = "9"
SRC_URI =
"http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz
\
"
-SRC_URI[md5sum] = "bd66b19bd6fc3d320bd8d51869c874f9"
-SRC_URI[sha256sum] =
"1168f44cfcd1243acda6bb9663f5d9b3a4bca2acd372e979b97b58ecf5c713e2"
+
+SRC_URI[md5sum] = "2720ab8c480019f79e717b0237570311"
+SRC_URI[sha256sum] =
"22df4f197985f36f77b7b0d44de92ff44415885045f0191b3319540bdc82ff53"
S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
--
2.9.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] imagemagick: update patchset
Sorry, please drop this one, I just noticed that Khem had sent another one.
// Robert
On 08/30/2016 09:44 AM, Robert Yang wrote:
Fixed:
ERROR: imagemagick-7.0.2-r0 do_fetch: Fetcher failure:
--2016-08-28 04:07:12--
http://www.imagemagick.org/download/releases/ImageMagick-7.0.2-7.tar.xz
Resolving www.imagemagick.org... 198.72.81.86
Connecting to www.imagemagick.org|198.72.81.86|:80... connected.
HTTP request sent, awaiting response... 404 Not Found
2016-08-28 04:07:12 ERROR 404: Not Found.
Signed-off-by: Robert Yang
---
meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
index 472e42d..5937062 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
@@ -8,11 +8,12 @@ DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw
freetype"
# Important note: tarballs for all patchsets within a version are deleted when
# a new pachset is created. To avoid multiple patches for each patchset, try to
# update to the last pachset of a version
-PATCHSET = "7"
+PATCHSET = "9"
SRC_URI =
"http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz
\
"
-SRC_URI[md5sum] = "bd66b19bd6fc3d320bd8d51869c874f9"
-SRC_URI[sha256sum] =
"1168f44cfcd1243acda6bb9663f5d9b3a4bca2acd372e979b97b58ecf5c713e2"
+
+SRC_URI[md5sum] = "2720ab8c480019f79e717b0237570311"
+SRC_URI[sha256sum] =
"22df4f197985f36f77b7b0d44de92ff44415885045f0191b3319540bdc82ff53"
S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 1/2] python3-vcversioner: add recipe
python3-vcversioner is needed by other python3 modules so it's good to have
a recipe for it.
Signed-off-by: Mikko Ylinen
---
.../python/python3-vcversioner_2.16.0.0.bb | 24 ++
1 file changed, 24 insertions(+)
create mode 100644
meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb
diff --git
a/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb
b/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb
new file mode 100644
index 000..189a65a
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Python vcversioner, automagically update the project's version"
+HOMEPAGE = "https://github.com/habnabit/vcversioner";
+
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=827a7a91a8d20d3c666b665cd96db8e3"
+
+SRC_URI[md5sum] = "aab6ef5e0cf8614a1b1140ed5b7f107d"
+SRC_URI[sha256sum] =
"dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b"
+
+inherit pypi setuptools3
+
+do_compile_append() {
+${PYTHON} setup.py -q bdist_egg --dist-dir ./
+}
+
+do_install_append() {
+install -m 0644 ${S}/vcversioner*.egg ${D}/${PYTHON_SITEPACKAGES_DIR}/
+}
+
+RDEPENDS_${PN} += "\
+${PYTHON_PN}-subprocess \
+"
+
+BBCLASSEXTEND = "native"
--
2.9.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 2/2] python3-jsonschema: set dependency to vcversioner
The recently added python3-jsonschema depends on vcversioner. The
setuptools tries to fetch it but fails with bitbake if run behind
proxies. Explicitly set DEPENDS to ensure the dependency is installed
before running setup.py for python3-jsonschema.
Signed-off-by: Mikko Ylinen
---
meta-python/recipes-devtools/python/python3-jsonschema_2.5.1.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-python/recipes-devtools/python/python3-jsonschema_2.5.1.bb
b/meta-python/recipes-devtools/python/python3-jsonschema_2.5.1.bb
index 5aaee68..53b8839 100644
--- a/meta-python/recipes-devtools/python/python3-jsonschema_2.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-jsonschema_2.5.1.bb
@@ -1,6 +1,8 @@
inherit pypi setuptools3
require python-jsonschema.inc
+DEPENDS += "python3-vcversioner"
+
RDEPENDS_${PN} += " \
${PYTHON_PN}-misc \
"
--
2.9.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
