Skip to contentSkip to conversation

wvstreams, wvdial: Mark incompatible for musl

PATCH New Khem Raj 1 participant 1 message Oct 12, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 wvstreams, wvdial: Mark incompatible for musl

wvstreams needs porting work to get it fully functional on musl, wvdial depends on it so that needs to be disabled as well for musl.

Add it to meta-oe packagegroup only when using glibc

---
 .../wvdial/wvdial_1.61.bb                     |   1 +
 ...nt-use-ucontext-on-non-glibc-systems.patch | 135 ------------------
 .../wvdial/wvstreams_4.6.1.bb                 |   3 +-
 .../packagegroups/packagegroup-meta-oe.bb     |   5 +-
 4 files changed, 6 insertions(+), 138 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch
meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +1 -0
index 36580952f1..b985d39abf 100644
@@ -16,6 +16,7 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.bz2 \
 SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de"
 SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82"
 
+COMPATIBLE_HOST_libc-musl = "null"
 EXTRA_OEMAKE = ""
 export WVLINK="${LD}"
 
meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch deleted +0 -135

135 lines not on this page · raw message

meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +2 -1
index b9f62da7b5..b220f9c1bc 100644
@@ -15,7 +15,6 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
            file://gcc-6.patch \
            file://argp.patch \
            file://0001-Check-for-limits.h-during-configure.patch \
-           file://0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch \
            file://0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch \
            file://0004-wvcrash-Replace-use-of-basename-API.patch \
            file://0005-check-for-libexecinfo-during-configure.patch \
@@ -28,6 +27,8 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
 SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
 SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633"
 
+COMPATIBLE_HOST_libc-musl = "null"
+
 inherit autotools-brokensep pkgconfig
 
 TARGET_CFLAGS_append = " -fno-tree-dce -fno-optimize-sibling-calls"
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +3 -2
index 5bb0beb7a3..1f0a7b9470 100644
@@ -66,11 +66,12 @@ RDEPENDS_packagegroup-meta-oe-connectivity ="\
     modemmanager mosh  \
     paho-mqtt-c phonet-utils rabbitmq-c rfkill rtorrent \
     ser2net smstools3 telepathy-glib telepathy-idle thrift \
-    usbmuxd wvstreams zabbix zeromq \
+    usbmuxd zabbix zeromq \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obex-data-server", "", d)} \
     libmikmod \
-    obexftp openobex libnet wvdial \
+    obexftp openobex libnet \
     "
+RDEPENDS_packagegroup-meta-oe-connectivity_append_libc-glibc = " wvstreams wvdial"
 
 # dracut needs dracut
 RDEPENDS_packagegroup-meta-oe-core ="\
Signature · 1 line
2.23.0