From 86b0febac0a5eeeb68f0672177006ceb942af8ef Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 2 Mar 2015 18:37:50 +0100
Subject: [PATCH 1/2] fix BSD string function detection

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aaf07e2a1..7cfd54e3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,9 @@ CHECK_SYMBOL_EXISTS (sleep "unistd.h" HAVE_SLEEP)
 CHECK_SYMBOL_EXISTS (usleep "unistd.h" HAVE_USLEEP)
 CHECK_SYMBOL_EXISTS (access "unistd.h" HAVE_ACCESS)
 ENDIF(HAVE_UNISTD_H)
+CHECK_SYMBOL_EXISTS (strlcpy "string.h" HAVE_STRLCPY)
+CHECK_SYMBOL_EXISTS (strlcat "string.h" HAVE_STRLCAT)
+CHECK_SYMBOL_EXISTS (slprintf "string.h" HAVE_SLPRINTF)
 CHECK_SYMBOL_EXISTS (strcasecmp "string.h" HAVE_STRCASECMP)
 CHECK_SYMBOL_EXISTS (strncasecmp "string.h" HAVE_STRNCASECMP)
 CHECK_SYMBOL_EXISTS (_strlwr "string.h" HAVE__STRLWR)

From 48ea310364d69cf8b9b53858bb4047ec5fcd5ae4 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 2 Mar 2015 22:56:35 +0100
Subject: [PATCH 2/2] don't call nproc if the system doesn't have it

---
 s/build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/s/build b/s/build
index 40ab81283..068a669a1 100755
--- a/s/build
+++ b/s/build
@@ -1,7 +1,7 @@
 #!/bin/sh
-ROOT=$(pwd)
+ROOT=`pwd`
 while [ ! -d $ROOT/.git ]; do
-  ROOT=$(dirname $ROOT)
+  ROOT=`dirname $ROOT`
 done
 
 [ -z $BUILD ] && BUILD=Debug
@@ -11,7 +11,7 @@ MACHINE=`uname -m`
 [ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc"
 BIN_DIR="build-$MACHINE-$CC-$BUILD"
 
-[ -z "$JOBS" ] && JOBS=$(nproc)
+[ -z "$JOBS" ] && [ "" != "which nproc" ] && JOBS=`nproc`
 DISTCC=`which distcc`
 if [ ! -z "$DISTCC" ] ; then
 JOBS=`distcc -j`