From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Sun, 12 Jan 2020 18:39:17 +0000 (+0500)
Subject: CI: do not use LD_BIRARY_PATH anymore
X-Git-Tag: v3.0.0~234
X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=openssl-gost%2Fengine.git;a=commitdiff_plain;h=09615031fffa93d7b42af7ad1029d963445c7c74

CI: do not use LD_BIRARY_PATH anymore
---

diff --git a/.cirrus.yml b/.cirrus.yml
index 24d7fff..6e04657 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,7 +3,6 @@ FreeBSD_task:
     image_family: freebsd-12-1
   env:
     PREFIX: ${HOME}/opt
-    LD_LIBRARY_PATH: ${PREFIX}/lib
     PATH: ${PREFIX}/bin:${PATH}
     OPENSSL_BRANCH: master
   install_script:
@@ -12,7 +11,7 @@ FreeBSD_task:
   script:
     - git clone --depth 1 -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
     - cd openssl
-    - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} && make all install_sw > build.log 2>&1 || (cat build.log && exit 1)
+    - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} -Wl,-rpath=${PREFIX}/lib && make all install_sw > build.log 2>&1 || (cat build.log && exit 1)
     - cd ..
     - mkdir build
     - cd build
diff --git a/.travis.yml b/.travis.yml
index f1f19c3..d617ece 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,16 +47,13 @@ before_script:
   - sudo cpanm --notest Test2::V0 > build.log 2>&1 || (cat build.log && exit 1)
   - git clone --depth 1 -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
   - cd openssl
-  - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} && travis_wait make -s -j$(nproc) all && make -s install_sw
+  - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} -Wl,-rpath=${PREFIX}/lib && travis_wait make -s -j$(nproc) all && make -s install_sw
   - cd ..
 
 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:${DYLD_LIBRARY_PATH:-}"; fi
   - mkdir build
   - cd build
   - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ${ASAN} ..
   - make
   - make test CTEST_OUTPUT_ON_FAILURE=1
   - if [ -z "$ASAN" ]; then make tcl_tests; fi
-