[oe,meta-gnome,12/18] libgtop: Fix build with musl

Message ID	20170714054013.34458-12-raj.khem@gmail.com
State	Accepted
Commit	9dfececc96801e2e06d6140848bf21c92db1d2f9
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; From: Khem Raj <raj.khem@gmail.com> To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:07 -0700 Message-Id: <20170714054013.34458-12-raj.khem@gmail.com> In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-gnome][PATCH 12/18] libgtop: Fix build with musl Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org
Series	[oe,meta-initramfs,01/18] klibc: Fix build issue when default ISA is not thumb \| expand [oe,meta-initramfs,01/18] klibc: Fix build issue when default ISA is not thumb [oe,meta-oe,02/18] libteam: Upgrade to 1.27 [oe,meta-multimedia,03/18] sox: Fix build with musl [oe,meta-multimedia,04/18] webrtc-audio-processing: Link with libexecinfo on musl [oe,meta-multimedia,05/18] cdparanoia: Fix build with musl [oe,meta-efl,06/18] lightmediascanner: Define comparison_fn_t if undefined [oe,meta-oe,07/18] lmbench: Fix build with musl [oe,meta-xfce,08/18] xfce4-netload-plugin: Do not include sys/sysctl.h [oe,meta-xfce,09/18] imsettings: Fix build with musl [oe,meta-gnome,10/18] gedit: Define ACCESSPERMS if not defined already [oe,meta-gnome,11/18] onboard: Fix build with musl [oe,meta-gnome,12/18] libgtop: Fix build with musl [oe,meta-webserver,13/18] netdata: Upgrade to 1.6.0 [oe,meta-oe,14/18] can-utils: Update to tip of master [oe,meta-initramfs,15/18] kexec-tools-klibc: Fix build with musl [oe,meta-initramfs,16/18] dracut: Upgrade to 045 [oe,meta-filesystems,17/18] yaffs2-utils: Fix build with musl [oe,meta-filesystems,18/18] logfsprogs: Rename setkey API to _setkey to not conflict with libc

Message ID

20170714054013.34458-12-raj.khem@gmail.com

State

Accepted

Commit

9dfececc96801e2e06d6140848bf21c92db1d2f9

Headers

Received-SPF: pass (google.com: best guess record for domain of
	openembedded-devel-bounces@lists.openembedded.org designates
	140.211.169.62 as permitted sender) client-ip=140.211.169.62; 
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Date: Thu, 13 Jul 2017 22:40:07 -0700
Message-Id: <20170714054013.34458-12-raj.khem@gmail.com>
In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com>
References: <20170714054013.34458-1-raj.khem@gmail.com>
Subject: [oe] [meta-gnome][PATCH 12/18] libgtop: Fix build with musl
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: openembedded-devel-bounces@lists.openembedded.org
Errors-To: openembedded-devel-bounces@lists.openembedded.org

Series

[oe,meta-initramfs,01/18] klibc: Fix build issue when default ISA is not thumb | expand

Commit Message

Khem Raj July 14, 2017, 5:40 a.m. UTC

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...-Include-libc-net-headers-unconditionally.patch | 46 ++++++++++++++++++++++
 meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb |  3 ++
 2 files changed, 49 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch

-- 
2.13.2

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

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 000000000..c4f7da4bf
--- /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 d79b9e5d4..946d11845 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"

[oe,meta-gnome,12/18] libgtop: Fix build with musl

Commit Message

Patch