diff options
| author |   Gianfranco Costamagna <gianfranco.costamagna@abinsula.com> | 2017-05-11 14:28:11 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-05-23 15:49:33 +0200 |
| commit | 85810933a8b1e88a8ae8652387885abc0522b419 (patch) | |
| tree | 0bf2f0f37a8280516aafef420641fc32d21c4ad8 | |
| parent | 37acbb5d0fc76684ce172e3925ccd1d9252c7ffb (diff) | |
| download | meta-openembedded-contrib-85810933a8b1e88a8ae8652387885abc0522b419.tar.gz | |
wxstreams: fix build with gcc-6 (patch from Debian). Remove blacklists for wvstreams and wvdial
Signed-off-by: Gianfranco Costamagna <gianfranco.costamagna@abinsula.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch | 42 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 4 |
3 files changed, 43 insertions, 5 deletions
diff --git a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index 80e72bd8b3..f7adf4c9f4 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb @@ -28,5 +28,3 @@ do_configure() { do_install() { oe_runmake prefix=${D}/usr PPPDIR=${D}/etc/ppp/peers install } - -PNBLACKLIST[wvdial] ?= "Depends on broken wvstreams - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch new file mode 100644 index 0000000000..b084887ba7 --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch @@ -0,0 +1,42 @@ +Description: Fix compilation with gcc-6 +Author: Gert Wollny <gw.fossdev@gmail.com> +Last-Updated: 2016-07-26 +Forwarded: No +Bug-Debian: https://bugs.debian.org/811659 +Bug-Debian: https://bugs.debian.org/831146 + +--- a/streams/wvstream.cc ++++ b/streams/wvstream.cc +@@ -907,9 +907,9 @@ + + if (forceable) + { +- si.wants.readable = readcb; +- si.wants.writable = writecb; +- si.wants.isexception = exceptcb; ++ si.wants.readable = static_cast<bool>(readcb); ++ si.wants.writable = static_cast<bool>(writecb); ++ si.wants.isexception = static_cast<bool>(exceptcb); + } + else + { +@@ -1019,7 +1019,8 @@ + + IWvStream::SelectRequest WvStream::get_select_request() + { +- return IWvStream::SelectRequest(readcb, writecb, exceptcb); ++ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), ++ static_cast<bool>(exceptcb)); + } + + +@@ -1107,7 +1108,8 @@ + // inefficient, because if the alarm was expired then pre_select() + // returned true anyway and short-circuited the previous select(). + TRACE("hello-%p\n", this); +- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb); ++ return !alarm_was_ticking || select(0, static_cast<bool>(readcb), ++ static_cast<bool>(writecb), static_cast<bool>(exceptcb)); + } + + diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index fe79dc1ad2..607a6178f6 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -11,6 +11,7 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ file://05_gcc.diff \ file://06_gcc-4.7.diff \ file://07_buildflags.diff \ + file://gcc-6.patch \ " SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" @@ -46,6 +47,3 @@ FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debu FILES_${PN}-valgrind = "${libdir}/valgrind/wvstreams.supp" RDEPENDS_${PN} += "perl" - -# http://errors.yoctoproject.org/Errors/Details/68614/ -PNBLACKLIST[wvstreams] ?= "BROKEN: fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" |