From: "Khem Raj" <raj.khem@gmail.com>
To: Ross Burton <ross@burtonini.com>
Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>
Subject: Re: [oe] [meta-oe][PATCH] zsync: Fix build on musl
Date: Tue, 8 Jun 2021 09:35:51 -0700 [thread overview]
Message-ID: <CAMKF1spasSq+Xc4H-DjfVxnZs2_X51byXkv-33TgAkg1YFgqFA@mail.gmail.com> (raw)
In-Reply-To: <CAAnfSTs1y0HLWswwpH-weyqV9gLMJeM=nYK37Ea47bSOKfhMtA@mail.gmail.com>
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
> >
> >
> >
> >
prev parent reply other threads:[~2021-06-08 16:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMKF1spasSq+Xc4H-DjfVxnZs2_X51byXkv-33TgAkg1YFgqFA@mail.gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
--cc=ross@burtonini.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).