diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-12-14 09:36:29 -0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2018-01-08 11:37:46 -0500 |
commit | 43d2d966b957886bc54d7f15e6632211c41114c3 (patch) | |
tree | 82fff79799688f2d42d78b83adca7f859ee812cb /meta-networking | |
parent | 29a4983d5a4462d8e7b9abcd55bfb3013f578fdd (diff) | |
download | meta-openembedded-43d2d966b957886bc54d7f15e6632211c41114c3.tar.gz |
open-isns: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch | 38 | ||||
-rw-r--r-- | meta-networking/recipes-support/open-isns/open-isns_0.97.bb | 6 |
2 files changed, 41 insertions, 3 deletions
diff --git a/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch b/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch new file mode 100644 index 000000000..825e2bf6a --- /dev/null +++ b/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From e0d86318227a23f00cf0f6639a6685bb9f5771a1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 12 Dec 2017 09:42:19 -0800 | ||
4 | Subject: [PATCH] util.h: endian.h is available on musl on linux | ||
5 | |||
6 | just checking for glibc alone is not enough since | ||
7 | it excludes musl, therefore check for platform | ||
8 | being linux as well | ||
9 | |||
10 | Fixes build issues | ||
11 | |||
12 | include/libisns/util.h:114:12: fatal error: sys/endian.h: No such file or directory | ||
13 | # include <sys/endian.h> | ||
14 | ^~~~~~~~~~~~~~ | ||
15 | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | Upstream-Status: Submitted | ||
19 | |||
20 | include/libisns/util.h | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/include/libisns/util.h b/include/libisns/util.h | ||
24 | index 9a2bd13..6cc1a1b 100644 | ||
25 | --- a/include/libisns/util.h | ||
26 | +++ b/include/libisns/util.h | ||
27 | @@ -100,7 +100,7 @@ enum { | ||
28 | * There's no htonll yet | ||
29 | */ | ||
30 | #ifndef htonll | ||
31 | -# ifdef __GLIBC__ | ||
32 | +# if defined(__GLIBC__) || defined(__linux__) | ||
33 | # include <endian.h> | ||
34 | # include <byteswap.h> | ||
35 | # if __BYTE_ORDER == __BIG_ENDIAN | ||
36 | -- | ||
37 | 2.15.1 | ||
38 | |||
diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.97.bb b/meta-networking/recipes-support/open-isns/open-isns_0.97.bb index 420ef5be0..cc2959e2b 100644 --- a/meta-networking/recipes-support/open-isns/open-isns_0.97.bb +++ b/meta-networking/recipes-support/open-isns/open-isns_0.97.bb | |||
@@ -13,9 +13,9 @@ SECTION = "net" | |||
13 | 13 | ||
14 | DEPENDS = "openssl systemd" | 14 | DEPENDS = "openssl systemd" |
15 | 15 | ||
16 | SRC_URI = " \ | 16 | SRC_URI = "git://github.com/open-iscsi/open-isns \ |
17 | git://github.com/open-iscsi/open-isns \ | 17 | file://0001-util.h-endian.h-is-available-on-musl-on-linux.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV ?= "09954404e948e41eb0fce8e28836018b4ce3d20d" | 20 | SRCREV ?= "09954404e948e41eb0fce8e28836018b4ce3d20d" |
21 | 21 | ||