summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch38
-rw-r--r--meta-networking/recipes-support/open-isns/open-isns_0.99.bb (renamed from meta-networking/recipes-support/open-isns/open-isns_0.98.bb)6
2 files changed, 2 insertions, 42 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
deleted file mode 100644
index fbdc4e911..000000000
--- a/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From e0d86318227a23f00cf0f6639a6685bb9f5771a1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 Dec 2017 09:42:19 -0800
4Subject: [PATCH] util.h: endian.h is available on musl on linux
5
6just checking for glibc alone is not enough since
7it excludes musl, therefore check for platform
8being linux as well
9
10Fixes build issues
11
12include/libisns/util.h:114:12: fatal error: sys/endian.h: No such file or directory
13 # include <sys/endian.h>
14 ^~~~~~~~~~~~~~
15
16Upstream-Status: Submitted
17
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 include/libisns/util.h | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/include/libisns/util.h b/include/libisns/util.h
24index 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--
372.15.1
38
diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.98.bb b/meta-networking/recipes-support/open-isns/open-isns_0.99.bb
index 5e64f893e..a03b92f5f 100644
--- a/meta-networking/recipes-support/open-isns/open-isns_0.98.bb
+++ b/meta-networking/recipes-support/open-isns/open-isns_0.99.bb
@@ -13,11 +13,9 @@ SECTION = "net"
13 13
14DEPENDS = "openssl" 14DEPENDS = "openssl"
15 15
16SRC_URI = "git://github.com/open-iscsi/open-isns \ 16SRC_URI = "git://github.com/open-iscsi/open-isns"
17 file://0001-util.h-endian.h-is-available-on-musl-on-linux.patch \
18 "
19 17
20SRCREV = "e84374ce7d1f5fc58a4c0fc751e075b2cc752c34" 18SRCREV = "cfdbcff867ee580a71bc9c18c3a38a6057df0150"
21 19
22S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
23 21