All of lore.kernel.org
 help / color / mirror / Atom feed
From: Baruch Siach <baruch@tkos.co.il>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/sngrep: fix build with musl libc
Date: Sun, 30 Dec 2018 20:06:43 +0200	[thread overview]
Message-ID: <87d0pix51o.fsf@tkos.co.il> (raw)
In-Reply-To: <04bdf53b08f3f7c511f730fb1bd6bd61f4966115.1546192196.git.baruch@tkos.co.il>

Hi Buildroot list,

Baruch Siach writes:

> Add upstream patch fixing typo that causes build failure under musl,
> where stdin is constant.

I forgot this:

Fixes:
http://autobuild.buildroot.net/results/ab8/ab827021d4dae8ae98f667328e4a9a7e1c4288d0/
http://autobuild.buildroot.net/results/e99/e99e937c05be38d33e029fbfc737665b590c33bd/
http://autobuild.buildroot.net/results/e8c/e8ca0a40d8cd2c333b55fa9e67ddeead1f502d5a/

baruch

> Cc: Adam Duskett <aduskett@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  ...0001-capture-fix-typo-in-FILE-object.patch | 43 +++++++++++++++++++
>  1 file changed, 43 insertions(+)
>  create mode 100644 package/sngrep/0001-capture-fix-typo-in-FILE-object.patch
>
> diff --git a/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch b/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch
> new file mode 100644
> index 000000000000..ec8a0f5dc5bc
> --- /dev/null
> +++ b/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch
> @@ -0,0 +1,43 @@
> +From 604f6d0ce2ec42ac494d76c95e68850ea6e7da8f Mon Sep 17 00:00:00 2001
> +From: Sebastian Kemper <sebastian_ml@gmx.net>
> +Date: Sun, 4 Nov 2018 16:58:00 +0100
> +Subject: [PATCH] capture: fix typo in FILE object
> +
> +FILE *fstdin is defined, but when calling freopen() stdin is used instead
> +of fstdin.
> +
> +This causes the compile to fail:
> +
> +  CC       sngrep-capture.o
> +capture.c: In function 'capture_offline':
> +capture.c:194:21: error: assignment of read-only variable 'stdin'
> +         if (!(stdin = freopen("/dev/tty", "r", stdin))) {
> +                     ^
> +make[5]: *** [Makefile:519: sngrep-capture.o] Error 1
> +
> +This commit fixes the typo.
> +
> +Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
> +Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> +---
> +Upstream status: commit 604f6d0ce2ec
> +
> + src/capture.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/capture.c b/src/capture.c
> +index 911c35f43a35..a799413e2b0e 100644
> +--- a/src/capture.c
> ++++ b/src/capture.c
> +@@ -191,7 +191,7 @@ capture_offline(const char *infile, const char *outfile)
> + 
> +     // Reopen tty for ncurses after pcap have used stdin
> +     if (!strncmp(infile, "/dev/stdin", 10)) {
> +-        if (!(stdin = freopen("/dev/tty", "r", stdin))) {
> ++        if (!(fstdin = freopen("/dev/tty", "r", stdin))) {
> +             fprintf(stderr, "Failed to reopen tty while using stdin for capture.");
> +             return 1;
> +         }
> +-- 
> +2.19.2
> +


-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

  reply	other threads:[~2018-12-30 18:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-30 17:49 [Buildroot] [PATCH] package/sngrep: fix build with musl libc Baruch Siach
2018-12-30 18:06 ` Baruch Siach [this message]
2018-12-30 19:15 ` 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=87d0pix51o.fsf@tkos.co.il \
    --to=baruch@tkos.co.il \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.