* [meta-oe][PATCH] zsync: Fix build on musl
@ 2021-06-08 16:33 Khem Raj
2021-06-08 16:34 ` [oe] " Ross Burton
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2021-06-08 16:33 UTC (permalink / raw
To: openembedded-devel; +Cc: Khem Raj, Ross Burton
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Ross Burton <ross.burton@arm.com>
---
...0001-sha1-Include-unistd.h-for-off_t.patch | 29 +++++++++++++++++++
meta-oe/recipes-extended/zsync/zsync_0.6.2.bb | 4 ++-
2 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch
diff --git a/meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch b/meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch
new file mode 100644
index 0000000000..60bcd8166f
--- /dev/null
+++ b/meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch
@@ -0,0 +1,29 @@
+From 72ad6dd95441836afb1f113697339b3c694d0e69 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 8 Jun 2021 09:26:32 -0700
+Subject: [PATCH] sha1: Include unistd.h for off_t
+
+Musl systems do not get this definition indirectly like what happens
+on glibc, therefore include unistd.h to get the definition
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libzsync/sha1.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libzsync/sha1.h b/libzsync/sha1.h
+index 3946505..23d9434 100644
+--- a/libzsync/sha1.h
++++ b/libzsync/sha1.h
+@@ -16,6 +16,7 @@
+ #else
+ #include <sys/types.h>
+ #endif
++#include <unistd.h>
+
+ #define SHA1_BLOCK_LENGTH 64
+ #define SHA1_DIGEST_LENGTH 20
+--
+2.32.0
+
diff --git a/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb b/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb
index c61e26309d..b80bf9cded 100644
--- a/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb
+++ b/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb
@@ -5,7 +5,9 @@ LICENSE = "Artistic-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=71c0ac4d86266533509aa0825b8d323c"
SRC_URI = "http://zsync.moria.org.uk/download/${BP}.tar.bz2 \
- file://out-of-tree.patch"
+ file://out-of-tree.patch \
+ file://0001-sha1-Include-unistd.h-for-off_t.patch \
+ "
SRC_URI[sha256sum] = "0b9d53433387aa4f04634a6c63a5efa8203070f2298af72a705f9be3dda65af2"
inherit autotools
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [oe] [meta-oe][PATCH] zsync: Fix build on musl
2021-06-08 16:33 [meta-oe][PATCH] zsync: Fix build on musl Khem Raj
@ 2021-06-08 16:34 ` Ross Burton
2021-06-08 16:35 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Ross Burton @ 2021-06-08 16:34 UTC (permalink / raw
To: Khem Raj; +Cc: openembeded-devel
I've a better patch, hold off merging that recipe.
Ross
On Tue, 8 Jun 2021 at 17:33, Khem Raj <raj.khem@gmail.com> wrote:
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Ross Burton <ross.burton@arm.com>
> ---
> ...0001-sha1-Include-unistd.h-for-off_t.patch | 29 +++++++++++++++++++
> meta-oe/recipes-extended/zsync/zsync_0.6.2.bb | 4 ++-
> 2 files changed, 32 insertions(+), 1 deletion(-)
> create mode 100644 meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch
>
> diff --git a/meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch b/meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch
> new file mode 100644
> index 0000000000..60bcd8166f
> --- /dev/null
> +++ b/meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch
> @@ -0,0 +1,29 @@
> +From 72ad6dd95441836afb1f113697339b3c694d0e69 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Tue, 8 Jun 2021 09:26:32 -0700
> +Subject: [PATCH] sha1: Include unistd.h for off_t
> +
> +Musl systems do not get this definition indirectly like what happens
> +on glibc, therefore include unistd.h to get the definition
> +
> +Upstream-Status: Pending
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + libzsync/sha1.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/libzsync/sha1.h b/libzsync/sha1.h
> +index 3946505..23d9434 100644
> +--- a/libzsync/sha1.h
> ++++ b/libzsync/sha1.h
> +@@ -16,6 +16,7 @@
> + #else
> + #include <sys/types.h>
> + #endif
> ++#include <unistd.h>
> +
> + #define SHA1_BLOCK_LENGTH 64
> + #define SHA1_DIGEST_LENGTH 20
> +--
> +2.32.0
> +
> diff --git a/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb b/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb
> index c61e26309d..b80bf9cded 100644
> --- a/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb
> +++ b/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb
> @@ -5,7 +5,9 @@ LICENSE = "Artistic-2.0"
> LIC_FILES_CHKSUM = "file://COPYING;md5=71c0ac4d86266533509aa0825b8d323c"
>
> SRC_URI = "http://zsync.moria.org.uk/download/${BP}.tar.bz2 \
> - file://out-of-tree.patch"
> + file://out-of-tree.patch \
> + file://0001-sha1-Include-unistd.h-for-off_t.patch \
> + "
> SRC_URI[sha256sum] = "0b9d53433387aa4f04634a6c63a5efa8203070f2298af72a705f9be3dda65af2"
>
> inherit autotools
> --
> 2.32.0
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [oe] [meta-oe][PATCH] zsync: Fix build on musl
2021-06-08 16:34 ` [oe] " Ross Burton
@ 2021-06-08 16:35 ` Khem Raj
0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2021-06-08 16:35 UTC (permalink / raw
To: Ross Burton; +Cc: openembeded-devel
On Tue, Jun 8, 2021 at 9:34 AM Ross Burton <ross@burtonini.com> wrote:
>
> I've a better patch, hold off merging that recipe.
>
ok
> Ross
>
> On Tue, 8 Jun 2021 at 17:33, Khem Raj <raj.khem@gmail.com> wrote:
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > Cc: Ross Burton <ross.burton@arm.com>
> > ---
> > ...0001-sha1-Include-unistd.h-for-off_t.patch | 29 +++++++++++++++++++
> > meta-oe/recipes-extended/zsync/zsync_0.6.2.bb | 4 ++-
> > 2 files changed, 32 insertions(+), 1 deletion(-)
> > create mode 100644 meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch
> >
> > diff --git a/meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch b/meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch
> > new file mode 100644
> > index 0000000000..60bcd8166f
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/zsync/zsync/0001-sha1-Include-unistd.h-for-off_t.patch
> > @@ -0,0 +1,29 @@
> > +From 72ad6dd95441836afb1f113697339b3c694d0e69 Mon Sep 17 00:00:00 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Tue, 8 Jun 2021 09:26:32 -0700
> > +Subject: [PATCH] sha1: Include unistd.h for off_t
> > +
> > +Musl systems do not get this definition indirectly like what happens
> > +on glibc, therefore include unistd.h to get the definition
> > +
> > +Upstream-Status: Pending
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +---
> > + libzsync/sha1.h | 1 +
> > + 1 file changed, 1 insertion(+)
> > +
> > +diff --git a/libzsync/sha1.h b/libzsync/sha1.h
> > +index 3946505..23d9434 100644
> > +--- a/libzsync/sha1.h
> > ++++ b/libzsync/sha1.h
> > +@@ -16,6 +16,7 @@
> > + #else
> > + #include <sys/types.h>
> > + #endif
> > ++#include <unistd.h>
> > +
> > + #define SHA1_BLOCK_LENGTH 64
> > + #define SHA1_DIGEST_LENGTH 20
> > +--
> > +2.32.0
> > +
> > diff --git a/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb b/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb
> > index c61e26309d..b80bf9cded 100644
> > --- a/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb
> > +++ b/meta-oe/recipes-extended/zsync/zsync_0.6.2.bb
> > @@ -5,7 +5,9 @@ LICENSE = "Artistic-2.0"
> > LIC_FILES_CHKSUM = "file://COPYING;md5=71c0ac4d86266533509aa0825b8d323c"
> >
> > SRC_URI = "http://zsync.moria.org.uk/download/${BP}.tar.bz2 \
> > - file://out-of-tree.patch"
> > + file://out-of-tree.patch \
> > + file://0001-sha1-Include-unistd.h-for-off_t.patch \
> > + "
> > SRC_URI[sha256sum] = "0b9d53433387aa4f04634a6c63a5efa8203070f2298af72a705f9be3dda65af2"
> >
> > inherit autotools
> > --
> > 2.32.0
> >
> >
> >
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-08 16:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-08 16:33 [meta-oe][PATCH] zsync: Fix build on musl Khem Raj
2021-06-08 16:34 ` [oe] " Ross Burton
2021-06-08 16:35 ` Khem Raj
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).