Skip to content

Commit

Permalink
Merge branch 'hotfix/1.13.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
David Jones committed Sep 27, 2018
2 parents a1e2183 + ff9a98d commit bb3571d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGES

## 1.13.6
## 1.13.7

* Modify means by which zlib version is detected.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CAVEMAN_VERSION=1.13.6
CAVEMAN_VERSION=1.13.7
TEST_REF?=""
#Compiler
CC?=gcc
Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ INIT_DIR=`pwd`
grep MemTotal /proc/meminfo
set +x
echo; echo
LIBZ_VER=`echo '#include <zlib.h>' | cpp -H -o /dev/null | & head -1 | cut -d' ' -f 2 | xargs grep -e '#define ZLIB_VERSION' | cut -d ' ' -f 3 | perl -pe 's/["\n]//g'`
LIBZ_VER=`echo '#include <zlib.h>' | cpp -H -o /dev/null |& head -1 | cut -d' ' -f 2 | xargs grep -e '#define ZLIB_VERSION' | cut -d ' ' -f 3 | perl -pe 's/["\n]//g'`
echo $LIBZ_VER
if version_gt $LIBZ_VER $REQUIRED_MIN_LIBZ ; then
echo "Found acceptable libz version $LIBZ_VER."
Expand Down

0 comments on commit bb3571d

Please sign in to comment.