]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: travis-ci: link with ssl libraries using rpath instead of LD_LIBRARY_PATH...
authorIlya Shipitsin <chipitsine@gmail.com>
Fri, 20 Dec 2019 18:55:01 +0000 (23:55 +0500)
committerWilly Tarreau <w@1wt.eu>
Sat, 21 Dec 2019 11:14:21 +0000 (12:14 +0100)
modifying LD_LIBRARY_PATH/DYLD_LIBRARY_PATH also affects other utilities like curl
to avoid side effects let us use rpath for ssl library linking

Fixes #418

.travis.yml

index 9f1ec01950180818a4b693f3c68314da7dfdb0da..6df39f52b200ea50837cd406f3df9f9a79c39f98 100644 (file)
@@ -97,9 +97,7 @@ install:
 
 script:
   - make -C contrib/wurfl
-  - make -j3 CC=$CC V=1 TARGET=$TARGET $FLAGS DEBUG_CFLAGS="$DEBUG_CFLAGS" LDFLAGS="$LDFLAGS" 51DEGREES_SRC="$FIFTYONEDEGREES_SRC" EXTRA_OBJS="$EXTRA_OBJS"
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export LD_LIBRARY_PATH="${HOME}/opt/lib:${LD_LIBRARY_PATH:-}"; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then export DYLD_LIBRARY_PATH="${HOME}/opt/lib:${DYLD_LIBRARY_PATH:-}"; fi
+  - make -j3 CC=$CC V=1 TARGET=$TARGET $FLAGS DEBUG_CFLAGS="$DEBUG_CFLAGS" LDFLAGS="-L$SSL_LIB -Wl,-rpath,$SSL_LIB" 51DEGREES_SRC="$FIFTYONEDEGREES_SRC" EXTRA_OBJS="$EXTRA_OBJS"
   - ./haproxy -vv
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ldd haproxy; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then otool -L haproxy; fi