can we apply it ? seems nobody minds
2017-01-10 13:04 GMT+05:00 Ilya Shipitsin <chipits...@gmail.com>:
> * moving LD_LIBRARY_PATH as far as possible (otherwise "wget" picks it,
> which is not desirable)
> * split LD_LIBRARY_PATH into LD_LIBRARY_PATH/DYLD_LIBRARY_PATH depending
> on operating system
> * removed MBEDTLS_VERSION, OPENSSL_VERSION (the last depended on
> nonexistent OPENSSL_VERION variable)
> * removed "apt: true" from caching, it never worked actually
>
> this patch should be applied after https://www.mail-archive.com/
> openvpn-devel@lists.sourceforge.net/msg13843.html
> ---
> .travis.yml | 4 ++--
> .travis/build-deps.sh | 2 --
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 369db97..b8ec1ac 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -18,7 +18,6 @@ env:
> - OPENSSL_VERSION="1.0.1t"
> - OPENSSL_CFLAGS="-I${PREFIX}/include"
> - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
> - - LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}"
>
> matrix:
> include:
> @@ -63,7 +62,6 @@ addons:
> - linux-libc-dev
>
> cache:
> - apt: true
> ccache: true
> directories:
> - download-cache
> @@ -77,6 +75,8 @@ install:
> - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log &&
> exit 1)
>
> script:
> + - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export
> LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}"; fi
> + - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then export
> DYLD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}"; fi
> - autoreconf -vi
> - ./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG} ||
> (cat config.log && exit 1)
> - make -j$JOBS
> diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
> index bda54ee..3ffba0b 100755
> --- a/.travis/build-deps.sh
> +++ b/.travis/build-deps.sh
> @@ -2,8 +2,6 @@
> set -eux
>
> # Set defaults
> -MBEDTLS_VERSION="${MBEDTLS_VERSION:-2.2.1}"
> -OPENSSL_VERSION="${OPENSSL_VERION:-1.0.2h}"
> PREFIX="${PREFIX:-${HOME}/opt}"
>
> download_mbedtls () {
> --
> 2.5.5
>
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
