[oe] [meta-oe][morty][PATCH] Removed blacklist for wvstream.
Martin Sjöbeck
martin.sjobeck at multiq.com
Tue May 9 16:37:55 UTC 2017
Added patch to make wvstream compile with gcc6.
---
meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb | 1 -
.../recipes-connectivity/wvdial/wvstreams/gcc6-compilefix.patch | 9 +++++++++
meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 3 +--
3 files changed, 10 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/gcc6-compilefix.patch
diff --git a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
index 65617fa3b..47fbf0ac8 100644
--- a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
+++ b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
@@ -29,4 +29,3 @@ do_install() {
oe_runmake prefix=${D}/usr PPPDIR=${D}/etc/ppp/peers install
}
-PNBLACKLIST[wvdial] ?= "Depends on broken wvstreams"
diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc6-compilefix.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc6-compilefix.patch
new file mode 100644
index 000000000..87dca49c5
--- /dev/null
+++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc6-compilefix.patch
@@ -0,0 +1,9 @@
+--- a/wvrules.mk 2017-01-11 09:53:36.764897285 +0100
++++ b/wvrules.mk 2017-01-11 09:56:24.227454405 +0100
+@@ -83,7 +83,7 @@
+ INCFLAGS=$(addprefix -I,$(WVSTREAMS_INC) $(XPATH))
+ CPPFLAGS+=$(INCFLAGS) \
+- -D_BSD_SOURCE -D_GNU_SOURCE $(OSDEFINE) \
++ -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE -std=gnu++98 $(OSDEFINE) \
+ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+ -DUNSTABLE
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 8d864484a..cc0023a7b 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://gcc6-compilefix.patch \
"
SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
@@ -47,5 +48,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"
--
2.11.0
More information about the Openembedded-devel
mailing list