From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/libwebsockets: fix build with libev
Date: Mon, 7 Oct 2019 22:48:03 +0200 [thread overview]
Message-ID: <20191007224803.0642a3fd@windsurf> (raw)
In-Reply-To: <20191006125339.23402-2-fontaine.fabrice@gmail.com>
On Sun, 6 Oct 2019 14:53:39 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Fixes:
> - http://autobuild.buildroot.org/results/b5a2188dce90f3ca9bf0cc7a043c1a946b8e288f
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...ix-build-with-libev-and-without-test.patch | 52 +++++++++++++++++++
> 1 file changed, 52 insertions(+)
> create mode 100644 package/libwebsockets/0001-CMakeLists.txt-fix-build-with-libev-and-without-test.patch
>
> diff --git a/package/libwebsockets/0001-CMakeLists.txt-fix-build-with-libev-and-without-test.patch b/package/libwebsockets/0001-CMakeLists.txt-fix-build-with-libev-and-without-test.patch
> new file mode 100644
> index 0000000000..ff85571fc9
> --- /dev/null
> +++ b/package/libwebsockets/0001-CMakeLists.txt-fix-build-with-libev-and-without-test.patch
> @@ -0,0 +1,52 @@
> +From 72c761789550703f004962ae164c415928e5e35c Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 6 Oct 2019 14:45:15 +0200
> +Subject: [PATCH] CMakeLists.txt: fix build with libev and without testapps
> +
> +Move libev workaround outside the
> +if ((LWS_ROLE_H1 OR LWS_ROLE_H2) AND NOT LWS_WITHOUT_TESTAPPS) block
> +otherwise build fails on:
> +
> +/home/naourr/work/instance-1/output-1/build/libwebsockets-3.2.0/lib/event-libs/libev/libev.c: In function 'lws_ev_hrtimer_cb':
> +/home/naourr/work/instance-1/output-1/build/libwebsockets-3.2.0/lib/event-libs/libev/libev.c:34:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
> + ev_timer_set(&pt->ev.hrtimer, ((float)us) / 1000000.0, 0);
> + ^~~~~~~~~~~~
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/b5a2188dce90f3ca9bf0cc7a043c1a946b8e288f
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: https://github.com/warmcat/libwebsockets/pull/1707]
I changed that to the actual commit that was merged, since it has been
merged now. Applied, thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2019-10-07 20:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-06 12:53 [Buildroot] [PATCH 1/2] package/libwebsockets: fix build with libev and libevent Fabrice Fontaine
2019-10-06 12:53 ` [Buildroot] [PATCH 2/2] package/libwebsockets: fix build with libev Fabrice Fontaine
2019-10-07 20:48 ` Thomas Petazzoni [this message]
2019-10-07 20:47 ` [Buildroot] [PATCH 1/2] package/libwebsockets: fix build with libev and libevent Thomas Petazzoni
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=20191007224803.0642a3fd@windsurf \
--to=thomas.petazzoni@bootlin.com \
--cc=buildroot@busybox.net \
/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