From f351bea142eddf95257bda840f2af1b359d426d2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 14 Dec 2017 09:36:29 -0800 Subject: open-isns: Fix build with musl Signed-off-by: Khem Raj Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald (cherry picked from commit 43d2d966b957886bc54d7f15e6632211c41114c3) Signed-off-by: Armin Kuster --- ....h-endian.h-is-available-on-musl-on-linux.patch | 38 ++++++++++++++++++++++ .../recipes-support/open-isns/open-isns_0.97.bb | 6 ++-- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch 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 0000000000..825e2bf6ab --- /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 @@ +From e0d86318227a23f00cf0f6639a6685bb9f5771a1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 12 Dec 2017 09:42:19 -0800 +Subject: [PATCH] util.h: endian.h is available on musl on linux + +just checking for glibc alone is not enough since +it excludes musl, therefore check for platform +being linux as well + +Fixes build issues + +include/libisns/util.h:114:12: fatal error: sys/endian.h: No such file or directory + # include + ^~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + include/libisns/util.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/libisns/util.h b/include/libisns/util.h +index 9a2bd13..6cc1a1b 100644 +--- a/include/libisns/util.h ++++ b/include/libisns/util.h +@@ -100,7 +100,7 @@ enum { + * There's no htonll yet + */ + #ifndef htonll +-# ifdef __GLIBC__ ++# if defined(__GLIBC__) || defined(__linux__) + # include + # include + # if __BYTE_ORDER == __BIG_ENDIAN +-- +2.15.1 + 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 420ef5be00..cc2959e2b5 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" DEPENDS = "openssl systemd" -SRC_URI = " \ - git://github.com/open-iscsi/open-isns \ -" +SRC_URI = "git://github.com/open-iscsi/open-isns \ + file://0001-util.h-endian.h-is-available-on-musl-on-linux.patch \ + " SRCREV ?= "09954404e948e41eb0fce8e28836018b4ce3d20d" -- cgit 1.2.3-korg