CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

netkit-rwho: Fix build with musl

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
(cherry picked from commit 3f8e498450)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2017-08-31 16:26:44 -07:00 committed by Armin Kuster
parent 29225f2e23
commit f2e665e79e
3 changed files with 120 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch Normal file
View File

@ -0,0 +1,46 @@
From 55ab6f1389261edff5f4c942bc3b0d8e695856d7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 30 Aug 2017 18:11:33 -0700
Subject: [PATCH 1/2] Add missing include path to -I options
Fixes errors like
| rwho.c:52:10: fatal error: 'protocols/rwhod.h' file not found
| #include <protocols/rwhod.h>
| ^~~~~~~~~~~~~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
rwho/Makefile | 1 +
rwhod/Makefile | 2 ++
2 files changed, 3 insertions(+)
diff --git a/rwho/Makefile b/rwho/Makefile
index 6f86388..67b28d4 100644
--- a/rwho/Makefile
+++ b/rwho/Makefile
@@ -6,6 +6,7 @@ include ../MRULES
rwho: rwho.o
$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+CFLAGS += -I../include
rwho.o: ../version.h
install: rwho
diff --git a/rwhod/Makefile b/rwhod/Makefile
index 772b641..9034218 100644
--- a/rwhod/Makefile
+++ b/rwhod/Makefile
@@ -7,6 +7,8 @@ ifneq ($(USE_GLIBC),1)
CFLAGS += -D_GNU_SOURCE
endif
+CFLAGS += -I../include
+
OBJS = rwhod.o
rwhod: $(OBJS)
--
2.14.1

71
meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch Normal file
View File

@ -0,0 +1,71 @@
From 2108213242638fa355f662382f55495d91301858 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 30 Aug 2017 18:13:17 -0700
Subject: [PATCH 2/2] Fix build issues found with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
ruptime/ruptime.c | 1 +
rwho/rwho.c | 1 +
rwhod/rwhod.c | 5 +++--
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruptime/ruptime.c b/ruptime/ruptime.c
index 1d4f7b6..f1f043c 100644
--- a/ruptime/ruptime.c
+++ b/ruptime/ruptime.c
@@ -53,6 +53,7 @@ char ruptime_rcsid[] =
#include <string.h>
#include <errno.h>
#include <time.h>
+#include <fcntl.h>
struct hs {
char hs_hostname[MAXHOSTNAMELEN];
diff --git a/rwho/rwho.c b/rwho/rwho.c
index 63919ac..71aec9e 100644
--- a/rwho/rwho.c
+++ b/rwho/rwho.c
@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/08/01 20:44:18 dholland Exp $";
#include <assert.h>
#include <stdio.h>
#include <time.h>
+#include <fcntl.h>
#include <protocols/rwhod.h>
#include "../version.h"
diff --git a/rwhod/rwhod.c b/rwhod/rwhod.c
index 54498d0..40cabcf 100644
--- a/rwhod/rwhod.c
+++ b/rwhod/rwhod.c
@@ -76,6 +76,7 @@ char rcsid[] =
#include <grp.h>
#include <time.h>
#include <stdint.h>
+#include <fcntl.h>
#include "../version.h"
@@ -102,7 +103,7 @@ struct nlist nl[] = {
static void broadcaster(void);
static int configure(int s);
static int verify(const char *name);
-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)
+#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2))
static int getloadavg(double ptr[3], int n);
#endif
@@ -549,7 +550,7 @@ sendpacket(struct whod *wd)
}
}
-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)
+#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2))
/*
* Taken from:
*
--
2.14.1

4
meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb
View File

@ -8,7 +8,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}.orig.tar.gz;nam
${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}-13.debian.tar.gz;name=patch13 \
file://rwhod \
file://rwhod.default \
"
file://0001-Add-missing-include-path-to-I-options.patch \
file://0002-Fix-build-issues-found-with-musl.patch \
"
SRC_URI[archive.md5sum] = "0f71620d45d472f89134ba0d74242e75"
SRC_URI[archive.sha256sum] = "0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7"
SRC_URI[patch13.md5sum] = "82ed5a3c6b0bbf00b36508b9787963b9"