[Openvpn-devel,v2] travis: fix CFLAGS assignment error and add -Werror only when compiling on Linux for Linux

Message ID 20191110201718.31032-1-a@unstable.cc
State Accepted
Headers show
Series
  • [Openvpn-devel,v2] travis: fix CFLAGS assignment error and add -Werror only when compiling on Linux for Linux
Related show

Commit Message

Antonio Quartulli Nov. 10, 2019, 8:17 p.m.
CFLAGS may not resolve to anything and the build-check.sh script would
just fail.

Switch to EXTRA_FLAGS and use proper substitution so that the script won't
error out when EXTRA_FLAGS is uninitialized.

At the same time ensure that such flag is set only when compiling *for*
linux (we use linux to also compile *for* windows)

Signed-off-by: Antonio Quartulli <a@unstable.cc>
---

Tested on travis: https://travis-ci.org/ordex/openvpn/builds/610047381

Changes from v1:
- use EXTRA_CONFIG with --enable-werror instead of adding -Werror
  manually to the CFLAGS
- make sure to add werror directive *before* executing ./configure
  command

 .travis/build-check.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Arne Schwabe Nov. 17, 2019, 7:04 p.m. | #1
Am 10.11.19 um 21:17 schrieb Antonio Quartulli:
> CFLAGS may not resolve to anything and the build-check.sh script would
> just fail.
> 
> Switch to EXTRA_FLAGS and use proper substitution so that the script won't
> error out when EXTRA_FLAGS is uninitialized.
> 
> At the same time ensure that such flag is set only when compiling *for*
> linux (we use linux to also compile *for* windows)
> 

Tested it and verified that --enable-werror is used.

Acked-By: Arne Schwabe <arne@rfc2549.org>

Arne
Gert Doering Nov. 27, 2019, 7:59 p.m. | #2
Your patch has been applied to the master branch.

I have not done any sort of test, except "now pushing to master, which
will make travis either explode or happy" :-) - as the patch does not
touch anything but travis config, it's fairly save for the rest.

thanks,

commit e0fbb584b8c4acba15feed7e30a778dde6389677
Author: Antonio Quartulli
Date:   Sun Nov 10 21:17:18 2019 +0100

     travis: fix CFLAGS assignment error and add -Werror only when compiling on Linux for Linux

     Signed-off-by: Antonio Quartulli <a@unstable.cc>
     Acked-by: Arne Schwabe <arne@rfc2549.org>
     Message-Id: <20191110201718.31032-1-a@unstable.cc>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19109.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/.travis/build-check.sh b/.travis/build-check.sh
index 250bb454..f794704c 100755
--- a/.travis/build-check.sh
+++ b/.travis/build-check.sh
@@ -8,7 +8,6 @@  fi
 
 if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
 	export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}"
-	export CFLAGS="${CFLAGS} -Werror"
 fi
 
 if [ "${TRAVIS_OS_NAME}" = "osx"   ]; then
@@ -18,10 +17,15 @@  fi
 autoreconf -vi
 
 if [ -z ${CHOST+x} ]; then
+	if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+		export EXTRA_CONFIG="${EXTRA_CONFIG:-} --enable-werror"
+	fi
 	./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG:-} || (cat config.log && exit 1)
 	make -j$JOBS
 	src/openvpn/openvpn --version || true
-	if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ldd src/openvpn/openvpn; fi
+	if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+		ldd src/openvpn/openvpn;
+	fi
 	if [ "${TRAVIS_OS_NAME}" = "osx" ]; then otool -L src/openvpn/openvpn; fi
 	make check
 	${EXTRA_SCRIPT:-}