From b493f36887f39263a202956a1a63de972c0575b5 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 8 May 2017 19:47:20 -0700 Subject: [PATCH] linuxptp: Remove unnecessary netdb.h includes This backports a patch that has been accepted upstream in linuxptp: 8b61aa2c3f3103db1d4ca1d1e49bb4f8831c1abf ("udp: Avoid including netdb.h") to fix build errors with external glibc toolchains that provide rpc/types.h. Signed-off-by: Florian Fainelli --- net/linuxptp/Makefile | 2 +- net/linuxptp/patches/002-netdb_fix.patch | 77 ++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 net/linuxptp/patches/002-netdb_fix.patch diff --git a/net/linuxptp/Makefile b/net/linuxptp/Makefile index e75be1830b..8ff217d7e0 100644 --- a/net/linuxptp/Makefile +++ b/net/linuxptp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linuxptp PKG_VERSION:=1.8 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_MAINTAINER:=Wojciech Dubowik PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz diff --git a/net/linuxptp/patches/002-netdb_fix.patch b/net/linuxptp/patches/002-netdb_fix.patch new file mode 100644 index 0000000000..2535568798 --- /dev/null +++ b/net/linuxptp/patches/002-netdb_fix.patch @@ -0,0 +1,77 @@ +From 60db5d0b0fd8be9afede7e8a14e708f5429f2023 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Sun, 7 May 2017 11:16:06 -0700 +Subject: [PATCH] udp: Avoid including netdb.h + +netdb.h pulls in a large chain of include files: +rpc/netdb.h +rpc/types.h + +rpc/types.h re-defines TRUE/FALSE and does it in this way: + + #ifndef FALSE + # define FALSE (0) + #endif + + #ifndef TRUE + # define TRUE (1) + #endif + +And this later causes build problems that appear in this way: + +mipsel-linux-gnu-gcc -Wall -DVER=1.8 -D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME +-DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC -Os -pipe -mno-branch-likely +-mips32r2 -mtune=24kc -fno-caller-saves -Wno-unused-result +-D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro +-I/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/usr/include +-I/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/include +-I/home/florian/dev/toolchains/stbgcc-4.8-1.5/usr/include +-I/home/florian/dev/toolchains/stbgcc-4.8-1.5/include +-DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC -c -o +udp.o udp.c +In file included from +/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/usr/include/rpc/netdb.h:45:0, + from +/home/florian/dev/toolchains/stbgcc-4.8-1.5/mipsel-linux-gnu/sys-root/usr/include/netdb.h:32, + from udp.c:23: +pdt.h:25:7: error: expected identifier before '(' token + enum {FALSE, TRUE}; + ^ +: recipe for target 'udp.o' failed + +Upon inspection, it does not appear that netdb.h is providing any useful +definition or declaration, so let's just remove its inclusion. + +Signed-off-by: Florian Fainelli +--- + udp.c | 1 - + udp6.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/udp.c b/udp.c +index 6dabc31836fe..530a2ee3748d 100644 +--- a/udp.c ++++ b/udp.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/udp6.c b/udp6.c +index c229cac0c41c..89e27bf9e863 100644 +--- a/udp6.c ++++ b/udp6.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.11.0 + -- 2.30.2