diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2017-02-21 22:12:22 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-02-23 21:50:38 +0100 |
| commit | 5d436ac5a6271ed08774c7110e4569c6b4484c4e (patch) | |
| tree | 7fdc4406893cf65f5329da0c4ddf1db59496dc8c /package/sslh | |
| parent | 3b1f2c7719da847c3a5f9b8f54225212cc399da2 (diff) | |
| download | buildroot-5d436ac5a6271ed08774c7110e4569c6b4484c4e.tar.gz buildroot-5d436ac5a6271ed08774c7110e4569c6b4484c4e.zip | |
package/sslh: fix script, does not build in parallel
The Makefile is not parallel-safe, so we build with MAKE1. Since the
source is very small, this has minor impact on performance.
The genver.sh script contains a troll character U+c2a0 (non-break space)
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/sslh')
| -rw-r--r-- | package/sslh/0002-replace-U+c2a0.patch | 12 | ||||
| -rw-r--r-- | package/sslh/sslh.mk | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/package/sslh/0002-replace-U+c2a0.patch b/package/sslh/0002-replace-U+c2a0.patch new file mode 100644 index 0000000000..38093fa250 --- /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 31774441ca..17aafd16c2 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 |
