[4.1] adea180 With FreeBSD 10.3 on a BeagleBone PCRE JIT explodes in the pcre_study() function.
Lasse Karstensen
lkarsten at varnish-software.com
Tue Jun 14 12:58:08 CEST 2016
commit adea180f830c7a7bbcae0dc053a1b95ffaf94893
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon May 30 07:41:39 2016 +0000
With FreeBSD 10.3 on a BeagleBone PCRE JIT explodes in the pcre_study()
function.
Maybe we should have a configure-time test to see if it actually works,
but for now, just make autogen.des handle it.
Conflicts:
autogen.des
diff --git a/autogen.des b/autogen.des
index a562b06..42e7d1e 100755
--- a/autogen.des
+++ b/autogen.des
@@ -6,6 +6,8 @@ set -ex
make -k distclean > /dev/null 2>&1 || true
+OPTS=""
+
# Prefer CLANG if we have it, and have not given preferences
if [ -f /usr/bin/clang -a "x${CC}" = "x" ] ; then
CC=clang
@@ -18,6 +20,10 @@ else
DST="--prefix=/opt/varnish --mandir=/opt/varnish/man"
fi
+if [ "x`uname -po`" = "xFreeBSD armv6" ] ; then
+ OPTS="${OPTS} --disable-pcre-jit"
+fi
+
rm -f configure
. ./autogen.sh 2>&1 | egrep -v "(subdir-objects|is in a subdirectory)"
@@ -34,4 +40,5 @@ export CONFIG_SHELL=/bin/sh
--enable-debugging-symbols \
--enable-dependency-tracking \
--enable-tests \
+ $OPTS \
"$@"
More information about the varnish-commit
mailing list