mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 14:59:55 +00:00
Code Issues Projects Releases Wiki Activity

rcmd: Fix build with musl

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2017-09-22 10:57:56 -07:00
committed by Martin Jansa
parent 3c70b718e0
commit 107071acc6
3 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
+2
View File
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8"
SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \
file://0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch \
file://0001-genisoimage-Fix-fprintf-format-errors.patch \
file://0001-define-__THROW-to-avoid-build-issue-with-musl.patch \
file://0002-Do-not-use-rcmd-on-build-with-musl.patch \
"
SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9"
SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da"
meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch
+47
View File
@@ -0,0 +1,47 @@
From 7c3036609494296f7c29413bf3acba829c81f62c Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sat, 8 Aug 2015 22:58:57 +0200
Subject: [PATCH 1/2] define __THROW to avoid build issue with musl
Fixes:
http://autobuild.buildroot.net/results/d27/d2781e70b04a207e2e9397d888032294c7285034/build-end.log
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
genisoimage/sha256.h | 4 ++++
genisoimage/sha512.h | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/genisoimage/sha256.h b/genisoimage/sha256.h
index e7f4cb9..bcae7ef 100644
--- a/genisoimage/sha256.h
+++ b/genisoimage/sha256.h
@@ -29,6 +29,10 @@
#include <stdint.h>
#include <stdio.h>
+/* define __THROW to avoid build issue when it's not available from the libc */
+#ifndef __THROW
+# define __THROW
+#endif
/* Structure to save state of computation between the single steps. */
struct sha256_ctx
diff --git a/genisoimage/sha512.h b/genisoimage/sha512.h
index 7298355..8cee8b0 100644
--- a/genisoimage/sha512.h
+++ b/genisoimage/sha512.h
@@ -29,6 +29,10 @@
#include <stdint.h>
#include <stdio.h>
+/* define __THROW to avoid build issue when it's not available from the libc */
+#ifndef __THROW
+# define __THROW
+#endif
/* Structure to save state of computation between the single steps. */
struct sha512_ctx
--
2.14.1
meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch
+31
View File
@@ -0,0 +1,31 @@
From 510838b2c96a9b097b3ee2694cba1c3623b0bac7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 21 Sep 2017 22:38:05 -0700
Subject: [PATCH 2/2] Do not use rcmd on build with musl
cdrkit unconditionally enables code using rcmd(3), which isn't available
on musl.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/xconfig.h.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/xconfig.h.in b/include/xconfig.h.in
index 476c00b..6b4b298 100644
--- a/include/xconfig.h.in
+++ b/include/xconfig.h.in
@@ -186,8 +186,9 @@
* Instead use the tests AC_SMALL_FSEEKO/AC_SMALL/STELLO and make sure
* they are placed before the large file tests.
*/
-
+#ifdef __GLIBC__
#define HAVE_RCMD 1 /* rcmd() is present in libc/libsocket */
+#endif
#define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */
#define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */
#define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */
--
2.14.1