diff mbox series

[oe,meta-networking,3/4] netkit-rwho: Fix build with musl

Message ID 20170831020401.6367-3-raj.khem@gmail.com
State Superseded
Headers show
Series [oe,meta-networking,1/4] ntop: Fix build with musl | expand

Commit Message

Khem Raj Aug. 31, 2017, 2:04 a.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...001-Add-missing-include-path-to-I-options.patch | 44 ++++++++++++++
 .../0002-Fix-build-issues-found-with-musl.patch    | 69 ++++++++++++++++++++++
 .../recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb |  4 +-
 3 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch
 create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch

-- 
2.14.1

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

Comments

Armin Kuster Aug. 31, 2017, 9:49 p.m. UTC | #1 
On 08/30/2017 07:04 PM, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>   ...001-Add-missing-include-path-to-I-options.patch | 44 ++++++++++++++

>   .../0002-Fix-build-issues-found-with-musl.patch    | 69 ++++++++++++++++++++++

>   .../recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb |  4 +-

>   3 files changed, 116 insertions(+), 1 deletion(-)

>   create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch

>   create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch

>

> diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch

> new file mode 100644

> index 000000000..9899292b0

> --- /dev/null

> +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch

> @@ -0,0 +1,44 @@

> +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>

> +|          ^~~~~~~~~~~~~~~~~~~

> +


Am I not seeing "Upstream-Status"  in either patches?

- armin

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

> +---

> + 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

> +

> diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch

> new file mode 100644

> index 000000000..e149f3468

> --- /dev/null

> +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch

> @@ -0,0 +1,69 @@

> +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>

> +---

> + 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

> +

> diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb

> index 04baa4286..5685f03d6 100644

> --- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb

> +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb

> @@ -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"


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

Patch

diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch
new file mode 100644
index 000000000..9899292b0
--- /dev/null
+++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch
@@ -0,0 +1,44 @@ 
+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>
+---
+ 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
+
diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch
new file mode 100644
index 000000000..e149f3468
--- /dev/null
+++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch
@@ -0,0 +1,69 @@ 
+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>
+---
+ 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
+
diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb
index 04baa4286..5685f03d6 100644
--- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb
+++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb
@@ -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"