CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

openl2tp: Fix build without glibc's rpc/nsl support

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2018-05-09 12:00:00 -07:00 committed by Armin Kuster
parent 309963b2f1
commit 76ef5ac176
3 changed files with 5 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch
View File

@ -1,31 +0,0 @@
From 8f299df4dd1ca857e34859c377a29b183c630961 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 21 Sep 2017 13:05:03 -0700
Subject: [PATCH] l2tp_api.c: include rpc/clnt.h for 'resultproc_t'
Fixes
| /mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/openl2tp/1.8-r0/recipe-sysroot/usr/include/tirpc/rpc/pmap_clnt.h:81:12: error: unknown type name 'resultproc_t'; did you mean 'rpcproc_t'? | resultproc_t); | ^~~~~~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
l2tp_api.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/l2tp_api.c b/l2tp_api.c
index f0946fd..f77881c 100644
--- a/l2tp_api.c
+++ b/l2tp_api.c
@@ -26,6 +26,7 @@
#include <sys/types.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
+#include <rpc/clnt.h>
#include <rpc/pmap_clnt.h>
//#include <netinet/in.h>
--
2.14.1

36
meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch
View File

@ -1,36 +0,0 @@
From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 28 Mar 2017 11:46:56 -0700
Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc
Fixes build issues e.g.
In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if_pppox.h:24:
/mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if.h:97:2: error: expected identifier
IFF_LOWER_UP = 1<<16, /* __volatile__ */
^
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
plugins/ppp_unix.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c
index 869066f..5c1e44f 100644
--- a/plugins/ppp_unix.c
+++ b/plugins/ppp_unix.c
@@ -21,6 +21,11 @@
* Plugin to use the standard UNIX pppd
*/
+/* hack to make sure kernel headers understand that libc (musl)
+ * does define IFF_LOWER_UP et al.
+ */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
+
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
--
2.12.1

15
meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
View File

@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9d9259cbbf00945adc25a470c1d3585 \
file://usl/LICENSE;md5=9c1387a3c5213aa40671438af3e00793 \
"
DEPENDS = "popt flex readline"
DEPENDS = "popt flex readline rpcsvc-proto-native"
SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \
file://Makefile-modify-CFLAGS-to-aviod-build-error.patch \
@ -34,12 +34,7 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \
file://openl2tpd-enable-tests.patch \
file://run-ptest \
file://fix_linux_4.15_compile.patch \
"
SRC_URI_append_libc-musl = "\
file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \
file://0002-user-ipv6-structures.patch \
file://0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch \
"
SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0"
SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f"
@ -49,10 +44,10 @@ inherit autotools-brokensep pkgconfig systemd ptest
SYSTEMD_SERVICE_${PN} = "openl2tpd.service"
SYSTEMD_AUTO_ENABLE = "disable"
DEPENDS_append_libc-musl = " libtirpc"
CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc"
CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc"
LDFLAGS_append_libc-musl = " -ltirpc"
DEPENDS += "libtirpc"
CPPFLAGS += "-I${STAGING_INCDIR}/tirpc"
CFLAGS += "-I${STAGING_INCDIR}/tirpc"
LDFLAGS += "-ltirpc"
PARALLEL_MAKE = ""
EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable" CPPFLAGS="${CPPFLAGS}" OPT_CFLAGS="${CFLAGS}"'