build: no fatal errors when compiling with embedded libevent on macOS

diff --git a/.travis.yml b/.travis.yml
index ac7e87a4af12efa7e22ec2d0f5d7bbdbf993e3c3..0080b2ef46f51b2fcc547a61fed2a1d1dce07032 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,11 +27,14 @@ matrix:
       env: LLDPD_CONFIG_ARGS="--with-snmp --with-xml"
     - os: osx
       compiler: clang
-      env: LLDPD_CONFIG_ARGS="--with-embedded-libevent"
+      env: 
+        - MAKE_ARGS=""
+        - LLDPD_CONFIG_ARGS="--with-embedded-libevent"
     - os: osx
       compiler: clang
       if: tag =~ ^[0-9]
       env:
+        - MAKE_ARGS=""
         - LLDPD_UPLOAD=1
         - LLDPD_CONFIG_ARGS="--prefix=/usr/local --localstatedir=/var --sysconfdir=/private/etc --with-embedded-libevent --without-snmp --without-xml"
 deploy:

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 98cbba85b688d3cdeaf7d8de0696dd1f6adbd757..1e40bb1f2d9c2065ea44e04d69347fee8d508fc3 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -149,7 +149,7 @@ endif
 if LIBEVENT_EMBEDDED
 event.c: $(top_builddir)/libevent/libevent.la
 $(top_builddir)/libevent/libevent.la: $(top_srcdir)/libevent/*.c $(top_srcdir)/libevent/*.h
-       (cd $(top_builddir)/libevent && $(MAKE) CFLAGS="$${CFLAGS} -Wno-deprecated-declarations")
+       (cd $(top_builddir)/libevent && $(MAKE))
 endif
 
 ## systemd service file

diff --git a/tests/ci/run.sh b/tests/ci/run.sh
index 987fcff75b039eec0a0517390552230f717d4b28..81d38da0c93a214bea44abda32bfb08374a734a5 100755 (executable)
--- a/tests/ci/run.sh
+++ b/tests/ci/run.sh
@@ -21,7 +21,7 @@ esac
     cat config.log
     exit 1
 }
-make all check CFLAGS=-Werror
+make all check ${MAKE_ARGS-CFLAGS=-Werror}
 make distcheck
 
 case "$(uname -s)" in