Browse Source

libnet-1.2.x: fix uClibc regression caused by #1410

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
lilik-openwrt-22.03
Jo-Philipp Wich 10 years ago
parent
commit
bc4d049918
2 changed files with 9 additions and 4 deletions
  1. +1
    -1
      libs/libnet-1.2.x/Makefile
  2. +8
    -3
      libs/libnet-1.2.x/patches/100-musl-compat.patch

+ 1
- 1
libs/libnet-1.2.x/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libnet PKG_NAME:=libnet
PKG_VERSION:=1.2-rc3 PKG_VERSION:=1.2-rc3
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://sourceforge.net/projects/libnet-dev/files/ PKG_SOURCE_URL:=http://sourceforge.net/projects/libnet-dev/files/


+ 8
- 3
libs/libnet-1.2.x/patches/100-musl-compat.patch View File

@ -1,11 +1,16 @@
--- a/src/libnet_link_linux.c --- a/src/libnet_link_linux.c
+++ b/src/libnet_link_linux.c +++ b/src/libnet_link_linux.c
@@ -30,7 +30,7 @@
@@ -30,13 +30,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <net/if.h> #include <net/if.h>
-#if (__GLIBC__) -#if (__GLIBC__)
+#if (!__UCLIBC__)
#include <netinet/if_ether.h> #include <netinet/if_ether.h>
#include <net/if_arp.h> #include <net/if_arp.h>
#else
-#else
-#include <linux/if_arp.h>
-#include <linux/if_ether.h>
-#endif
#if (HAVE_PACKET_SOCKET)
#ifndef SOL_PACKET

Loading…
Cancel
Save