diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 8e1dc09db532..6e8a0d2824d9 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -1391,8 +1391,7 @@ jobs: macos-latest: name: MacOS Latest - # use 10.15 for now. Build fails on macos-11 (aka macos-latest) - runs-on: macos-10.15 + runs-on: macos-latest needs: [prepare-deps] steps: # Cache Rust stuff. @@ -1409,6 +1408,7 @@ jobs: hiredis \ jansson \ jq \ + libiconv \ libmagic \ libnet \ libtool \ @@ -1434,9 +1434,10 @@ jobs: - run: tar xvf prep/libhtp.tar.gz - run: tar xvf prep/suricata-update.tar.gz - run: ./autogen.sh - - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests + - run: CFLAGS="${DEFAULT_CFLAGS}" CPPFLAGS="-I/usr/local/opt/libiconv/include" CXXFLAGS="-I/usr/local/opt/libiconv/include" LDFLAGS="-L/usr/local/opt/libiconv/lib" ./configure --enable-unittests - run: make -j2 - - run: make check + # somehow it gets included by some C++ stdlib header (case unsensitive) + - run: rm libhtp/VERSION && make check - run: tar xf prep/suricata-verify.tar.gz - name: Running suricata-verify run: python3 ./suricata-verify/run.py diff --git a/src/util-daemon.c b/src/util-daemon.c index 8e6e6b63cda5..085df077e686 100644 --- a/src/util-daemon.c +++ b/src/util-daemon.c @@ -110,7 +110,14 @@ void Daemonize (void) through conf file */ /* Creates a new process */ +#if defined(OS_DARWIN) && defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif pid = fork(); +#if defined(OS_DARWIN) && defined(__clang__) +#pragma clang diagnostic pop +#endif if (pid < 0) { /* Fork error */