Browse Source

Merge pull request #14377 from neheb/bfd

bfdd: fix compilation with glibc
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
38913265b7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 20 deletions
  1. +1
    -3
      net/bfdd/Makefile
  2. +12
    -4
      net/bfdd/patches/002-ipv6_musl_fix.patch
  3. +0
    -13
      net/bfdd/patches/010-uclibc.patch

+ 1
- 3
net/bfdd/Makefile View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bfdd
PKG_SOURCE_DATE:=2019-08-22
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_VERSION:=c54534beb524afc3972039f57b56ec65332b43f7
PKG_SOURCE_URL:=https://codeload.github.com/rzalamena/bfdd/tar.gz/$(PKG_SOURCE_VERSION)?
@ -46,8 +46,6 @@ define Package/bfdd/conffiles
/etc/bfdd/bfdd.json
endef
TARGET_CFLAGS += -D_GNU_SOURCE
define Package/bfdd/install
$(INSTALL_DIR) \
$(1)/usr/sbin \


+ 12
- 4
net/bfdd/patches/002-ipv6_musl_fix.patch View File

@ -1,10 +1,18 @@
--- a/bfd_packet.c 2019-08-15 02:45:47.270120616 +0300
+++ b/bfd_packet.c 2019-08-15 02:44:38.266117706 +0300
@@ -34,7 +34,6 @@
--- a/bfd_packet.c
+++ b/bfd_packet.c
@@ -29,12 +29,15 @@
#define _UAPI_IPV6_H
#endif /* _UAPI_IPV6_H */
+#include <features.h>
#include <linux/filter.h>
#include <linux/if_ether.h>
#include <linux/if_packet.h>
#include <linux/udp.h>
#include <linux/ip.h>
-#include <linux/ipv6.h>
+#ifdef __GLIBC__
#include <linux/ipv6.h>
+#endif
#include <arpa/inet.h>
#include <sys/types.h>

+ 0
- 13
net/bfdd/patches/010-uclibc.patch View File

@ -1,13 +0,0 @@
diff --git a/bfd_packet.c b/bfd_packet.c
index e8f99f9..2c9fa91 100644
--- a/bfd_packet.c
+++ b/bfd_packet.c
@@ -29,6 +29,8 @@
#define _UAPI_IPV6_H
#endif /* _UAPI_IPV6_H */
+#define _GNU_SOURCE
+
#include <linux/filter.h>
#include <linux/if_ether.h>
#include <linux/if_packet.h>

Loading…
Cancel
Save