From 9c071664ade65c21f1c1fb42c7c54f06c7857cdf Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Mon, 11 Feb 2019 10:32:30 -0800 Subject: [PATCH 1/2] [cirrus] Run playTests.sh * Pass `-Werror` through `MOREFLAGS` * Install `coreutils` * Run `playTests.sh` --- .cirrus.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 777d3eca1..506647a00 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,6 +10,7 @@ task: install_script: - sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf - pkg upgrade -y - - pkg install -y gmake - script: - - CFLAGS="-Werror" gmake -j all + - pkg install -y gmake coreutils + script: | + MOREFLAGS="-Werror" gmake -j all + gmake shortest From e1a799e5de563fe6e0739f0694ee8c0079b9fbdd Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Mon, 11 Feb 2019 17:43:43 -0800 Subject: [PATCH 2/2] [util] Fix UTIL_isLink() for FreeBSD --- programs/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/util.c b/programs/util.c index 0001cc3d8..d64660635 100644 --- a/programs/util.c +++ b/programs/util.c @@ -92,11 +92,12 @@ U32 UTIL_isLink(const char* infilename) /* macro guards, as defined in : https://linux.die.net/man/2/lstat */ #ifndef __STRICT_ANSI__ #if defined(_BSD_SOURCE) \ - || defined(__OpenBSD__) \ || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) \ || (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) \ || (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L)) \ - || (defined(__APPLE__) && defined(__MACH__)) + || (defined(__APPLE__) && defined(__MACH__)) \ + || defined(__OpenBSD__) \ + || defined(__FreeBSD__) int r; stat_t statbuf; r = lstat(infilename, &statbuf);