mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-30 00:50:00 +00:00
wvdial: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
Drop support for glibc < 2.10, in master we are at 2.28
|
||||
in process get it working with musl as well.
|
||||
|
||||
Upstream-Status: Inappropriate [No upstream]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
--- a/wvmodemscan.cc
|
||||
+++ b/wvmodemscan.cc
|
||||
@@ -495,16 +495,8 @@ static int fileselect(const struct diren
|
||||
// (no internal ISDN support) || !strncmp(e->d_name, "ttyI", 4);
|
||||
}
|
||||
|
||||
-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)
|
||||
static int filesort(const dirent **e1, const dirent **e2)
|
||||
-#else
|
||||
-static int filesort(const void *_e1, const void *_e2)
|
||||
-#endif
|
||||
{
|
||||
-#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))
|
||||
- dirent const * const *e1 = (dirent const * const *)_e1;
|
||||
- dirent const * const *e2 = (dirent const * const *)_e2;
|
||||
-#endif
|
||||
const char *p1, *p2;
|
||||
int diff;
|
||||
|
||||
@@ -11,8 +11,8 @@ RDEPENDS_${PN} = "ppp"
|
||||
|
||||
SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.bz2 \
|
||||
file://typo_pon.wvdial.1.patch \
|
||||
file://musl-support.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de"
|
||||
SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82"
|
||||
|
||||
@@ -21,8 +21,6 @@ export WVLINK="${LD}"
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
BUILD_CPPFLAGS += "-I${STAGING_INCDIR}/wvstreams"
|
||||
|
||||
do_configure() {
|
||||
sed -i 's/LDFLAGS+=-luniconf/LIBS+=-luniconf/' ${S}/Makefile
|
||||
}
|
||||
@@ -30,5 +28,3 @@ do_configure() {
|
||||
do_install() {
|
||||
oe_runmake prefix=${D}/usr PPPDIR=${D}/etc/ppp/peers install
|
||||
}
|
||||
# http://errors.yoctoproject.org/Errors/Details/186959/
|
||||
EXCLUDE_FROM_WORLD_libc-musl = "1"
|
||||
|
||||
Reference in New Issue
Block a user