diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/libgtop')
| -rw-r--r-- | meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch | 46 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb | 3 |
2 files changed, 49 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch new file mode 100644 index 0000000000..c4f7da4bf6 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch @@ -0,0 +1,46 @@ +From 3c6f70e50cb586ac4add4dea627c316242691040 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Jul 2017 09:17:29 -0700 +Subject: [PATCH] netload: Include libc net headers unconditionally + +This fixes compile with musl, and this conditional +is not needed now a days if we are still using glibc < 1.0 +we have other bigger problems + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sysdeps/linux/netload.c | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c +index c275db2..446bddd 100644 +--- a/sysdeps/linux/netload.c ++++ b/sysdeps/linux/netload.c +@@ -34,8 +34,6 @@ + #include <sys/socket.h> + #include <sys/ioctl.h> + +-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 +-/* GNU LibC */ + #include <net/if.h> + #include <netinet/ip_icmp.h> + #include <netinet/in.h> +@@ -43,15 +41,6 @@ + #include <netinet/tcp.h> + #include <netinet/udp.h> + #include <net/if.h> +-#else /* Libc 5 */ +-#include <linux/if.h> +-#include <linux/in.h> +-#include <linux/ip.h> +-#include <linux/icmp.h> +-#include <linux/tcp.h> +-#include <linux/udp.h> +-#endif +- + + #ifdef HAVE_IFADDRS_H + /* needed for IPV6 support */ +-- +2.13.2 + diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb index d79b9e5d4f..946d11845c 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb @@ -6,6 +6,9 @@ inherit gnomebase lib_package gtk-doc distro_features_check gobject-introspectio # depends on libxau REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-netload-Include-libc-net-headers-unconditionally.patch \ + " SRC_URI[archive.md5sum] = "ee29a9ef60659ebf4b075ac281f71cb2" SRC_URI[archive.sha256sum] = "463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5" |