Skip to contentSkip to conversation

ifplugd: Include stdint.h for uintXX_t

PATCH New Khem Raj 1 participant 3 messages Nov 6, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 ifplugd: Include stdint.h for uintXX_t

stdint.h is standard header which should provide these types Fixes

../../ifplugd-0.28/src/ethtool-local.h:27:9: error: unknown type name 'uint8_t'

typedef uint8_t u8;
        ^
---
 .../ifplugd/ifplugd/Fix-build-with-musl.patch        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch +5 -7
index 4bd40606b0..35665bd3f2 100644
@@ -9,13 +9,14 @@ Signed-off-by: Fabio Berton <[email protected]>
  src/ethtool-local.h | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/src/ethtool-local.h b/src/ethtool-local.h
-index 200476b..0edc7a9 100644
 --- a/src/ethtool-local.h
 +++ b/src/ethtool-local.h
-@@ -22,9 +22,9 @@
+@@ -20,11 +20,11 @@
+  * along with ifplugd; if not, write to the Free Software Foundation,
+  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
   */
- 
+-
++#include <stdint.h>
  typedef unsigned long long u64;
 -typedef __uint32_t u32;        
 -typedef __uint16_t u16;        
@@ -26,6 +27,3 @@ index 200476b..0edc7a9 100644
  
  #include "ethtool-kernel.h"
  
--- 
-2.20.1
-
Signature · 1 line
2.24.0
author
#1 lore raw

PATCH 2/3 netkit-rwho: Include stdint.h for int32_t

This ensures that when libc does not include stdint.h indirectly then it still can compile

Fixes
| ../include/protocols/rwhod.h:57:2: error: unknown type name 'int32_t'; did you mean 'uint32_t'?

---
 ...002-Fix-build-issues-found-with-musl.patch | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)
meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch +11 -10
index 717b4d73f4..349a1351fe 100644
@@ -12,8 +12,6 @@ Upstream-Status: Pending
  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[] =
@@ -24,11 +22,9 @@ index 1d4f7b6..f1f043c 100644
  
  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 $";
+@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/0
  #include <assert.h>
  #include <stdio.h>
  #include <time.h>
@@ -36,8 +32,6 @@ index 63919ac..71aec9e 100644
  #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[] =
@@ -66,6 +60,13 @@ index 54498d0..40cabcf 100644
  /*
   * Taken from:
   *
--- 
-2.14.1
-
+--- a/include/protocols/rwhod.h
++++ b/include/protocols/rwhod.h
+@@ -37,6 +37,7 @@
+ #ifndef _RWHOD_H_
+ #define	_RWHOD_H_
+ 
++#include <stdint.h>
+ /*
+  * rwho protocol packet format.
+  */
Signature · 1 line
2.24.0
author
#2 lore raw

PATCH 3/3 libowfat: Fix parallel build

In reply to Khem Raj
---
 .../ncp/libowfat/parallel_make.patch          | 20 +++++++++++++++++++
 .../recipes-support/ncp/libowfat_0.32.bb      |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-support/ncp/libowfat/parallel_make.patch
meta-networking/recipes-support/ncp/libowfat/parallel_make.patch new file +20 -0
new file mode 100644
index 0000000000..ea39c771c3
@@ -0,0 +1,20 @@
+Depend on haveuint128.h for umult64.c
+
+This fixes parallel build issue e.g.
+mult/umult64.c:9:10: fatal error: 'haveuint128.h' file not found
+#include "haveuint128.h"
+         ^~~~~~~~~~~~~~~
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+--- a/Makefile
++++ b/Makefile
+@@ -430,7 +430,7 @@ range_str4inbuf.o: mult/range_str4inbuf.
+ range_strinbuf.o: mult/range_strinbuf.c rangecheck.h
+ umult16.o: mult/umult16.c uint16.h
+ umult32.o: mult/umult32.c uint32.h
+-umult64.o: mult/umult64.c uint64.h
++umult64.o: mult/umult64.c uint64.h haveuint128.h
+ open_append.o: open/open_append.c open.h
+ open_excl.o: open/open_excl.c open.h
+ open_read.o: open/open_read.c open.h
meta-networking/recipes-support/ncp/libowfat_0.32.bb +3 -1
index a5e2c21cf0..b668b0ed5f 100644
@@ -6,7 +6,9 @@ HOMEPAGE = "http://www.fefe.de/libowfat"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz"
+SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \
+           file://parallel_make.patch \
+          "
 SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc"
 SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1"
 
Signature · 1 line
2.24.0