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

wvdial: Fix build with musl

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-07-12 15:31:36 -07:00
parent 225a741952
commit e71751bf3c
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/wvdial/wvdial/musl-support.patch
+25
View File
@@ -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;
meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
+1 -5
View File
@@ -11,8 +11,8 @@ RDEPENDS_${PN} = "ppp"
SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.bz2 \ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.bz2 \
file://typo_pon.wvdial.1.patch \ file://typo_pon.wvdial.1.patch \
file://musl-support.patch \
" "
SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de" SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de"
SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82" SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82"
@@ -21,8 +21,6 @@ export WVLINK="${LD}"
PARALLEL_MAKE = "" PARALLEL_MAKE = ""
BUILD_CPPFLAGS += "-I${STAGING_INCDIR}/wvstreams"
do_configure() { do_configure() {
sed -i 's/LDFLAGS+=-luniconf/LIBS+=-luniconf/' ${S}/Makefile sed -i 's/LDFLAGS+=-luniconf/LIBS+=-luniconf/' ${S}/Makefile
} }
@@ -30,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
} }
# http://errors.yoctoproject.org/Errors/Details/186959/
EXCLUDE_FROM_WORLD_libc-musl = "1"