mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 16:27:27 +00:00
Code Issues Projects Releases Wiki Activity

wxstreams: fix build with gcc-6 (patch from Debian). Remove blacklists for wvstreams and wvdial

Browse Source 
Signed-off-by: Gianfranco Costamagna <gianfranco.costamagna@abinsula.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Gianfranco Costamagna
2017-05-11 14:28:11 +02:00
committed by Armin Kuster
parent cbf0846304
commit 41ef0f7fbc
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
-2
View File
@@ -28,5 +28,3 @@ do_configure() {
do_install() { do_install() {
oe_runmake prefix=${D}/usr PPPDIR=${D}/etc/ppp/peers 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"
meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch
+42
View File
@@ -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));
}
meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
+1 -3
View File
@@ -11,6 +11,7 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
file://05_gcc.diff \ file://05_gcc.diff \
file://06_gcc-4.7.diff \ file://06_gcc-4.7.diff \
file://07_buildflags.diff \ file://07_buildflags.diff \
file://gcc-6.patch \
" "
SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" 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" FILES_${PN}-valgrind = "${libdir}/valgrind/wvstreams.supp"
RDEPENDS_${PN} += "perl" 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"