From: Ilya Shipitsin Date: Tue, 4 Aug 2020 10:39:41 +0000 (+0500) Subject: CI: travis-ci: specify SLZ_LIB, SLZ_INC for travis builds X-Git-Tag: v2.3-dev3~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bab67529c1c59513880dbb398623e96d8cfcf7ee;p=thirdparty%2Fhaproxy.git CI: travis-ci: specify SLZ_LIB, SLZ_INC for travis builds These variables must be explicitly set as they are not inherited from the environment. Till now they were ignored. --- diff --git a/.travis.yml b/.travis.yml index 942b68be5a..ca867d9672 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,7 +133,7 @@ install: script: - if [ "${CC%-*}" = "clang" ]; then export FLAGS="$FLAGS USE_OBSOLETE_LINKER=1" DEBUG_CFLAGS="-g -fsanitize=address" LDFLAGS="-fsanitize=address"; fi - make -C contrib/wurfl - - make -j3 CC=$CC CPU_CFLAGS.generic="-O1" V=1 ERR=1 TARGET=$TARGET $FLAGS DEBUG_CFLAGS="$DEBUG_CFLAGS" LDFLAGS="$LDFLAGS" ADDLIB="$ADDLIB" SSL_LIB="$SSL_LIB" SSL_INC="$SSL_INC" 51DEGREES_SRC="$FIFTYONEDEGREES_SRC" EXTRA_OBJS="$EXTRA_OBJS" $DEBUG_OPTIONS + - make -j3 CC=$CC CPU_CFLAGS.generic="-O1" V=1 ERR=1 TARGET=$TARGET $FLAGS DEBUG_CFLAGS="$DEBUG_CFLAGS" LDFLAGS="$LDFLAGS" ADDLIB="$ADDLIB" SSL_LIB="$SSL_LIB" SSL_INC="$SSL_INC" SLZ_LIB="$SLZ_LIB" SLZ_INC="$SLZ_INC" 51DEGREES_SRC="$FIFTYONEDEGREES_SRC" EXTRA_OBJS="$EXTRA_OBJS" $DEBUG_OPTIONS - ./haproxy -vv - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ldd haproxy; fi - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then otool -L haproxy; fi