From: Peter Seiderer <ps.report@gmx.net>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel
Date: Tue, 21 Feb 2017 22:15:57 +0100 [thread overview]
Message-ID: <20170221221557.097a9775@gmx.net> (raw)
In-Reply-To: <1487711542-31294-1-git-send-email-yann.morin.1998@free.fr>
Hello Yann,
On Tue, 21 Feb 2017 22:12:22 +0100, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> The Makefile is not parallel-safe, so we build with MAKE1. Since the
> source is very small, this has minor impact on perforance.
>
> The genver.sh script conaains a troll character U+c2a0 (non-break space)
Minor typo s/conaains/contains/...
Regards,
Peter
> which is refused by some versions of /bin/sh. Patch it away.
>
> Fixes:
> http://autobuild.buildroot.net/results/867/867c74ed74fd04ab06d1a10ff34ca177fe005fd2/
> http://autobuild.buildroot.net/results/f97/f971629bc99147f9014e52c6ef71c3417faa6b67/
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: David Bachelart <david.bachelart@bbright.com>
> ---
> package/sslh/0002-replace-U+c2a0.patch | 12 ++++++++++++
> package/sslh/sslh.mk | 2 +-
> 2 files changed, 13 insertions(+), 1 deletion(-)
> create mode 100644 package/sslh/0002-replace-U+c2a0.patch
>
> diff --git a/package/sslh/0002-replace-U+c2a0.patch b/package/sslh/0002-replace-U+c2a0.patch
> new file mode 100644
> index 0000000..38093fa
> --- /dev/null
> +++ b/package/sslh/0002-replace-U+c2a0.patch
> @@ -0,0 +1,12 @@
> +diff -durN sslh-v1.18.orig/genver.sh sslh-v1.18/genver.sh
> +--- sslh-v1.18.orig/genver.sh 2017-02-21 22:03:40.849161283 +0100
> ++++ sslh-v1.18/genver.sh 2017-02-21 22:03:59.173402356 +0100
> +@@ -25,7 +25,7 @@
> + fi
> + fi
> +
> +-if [ -d .git ]?&& head=`git rev-parse --verify HEAD 2>/dev/null`; then
> ++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
> + # generate the version info based on the tag
> + release=`(git describe --tags || git --describe || git describe --all --long) \
> + 2>/dev/null | tr -d '\n'`
> diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
> index 3177444..17aafd1 100644
> --- a/package/sslh/sslh.mk
> +++ b/package/sslh/sslh.mk
> @@ -12,7 +12,7 @@ SSLH_LICENSE_FILES = COPYING
> SSLH_DEPENDENCIES = libconfig
>
> define SSLH_BUILD_CMDS
> - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> + $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> endef
>
> define SSLH_INSTALL_TARGET_CMDS
next prev parent reply other threads:[~2017-02-21 21:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-21 21:12 [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel Yann E. MORIN
2017-02-21 21:15 ` Peter Seiderer [this message]
2017-02-21 21:17 ` Peter Seiderer
2017-02-21 21:22 ` Yann E. MORIN
2017-02-23 20:52 ` Thomas Petazzoni
2017-02-23 20:56 ` Yann E. MORIN
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=20170221221557.097a9775@gmx.net \
--to=ps.report@gmx.net \
--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.