X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.cirrus.yml;h=7a0c3c9322062110b28d257ee4163097bfc5691a;hb=e49a93dbfa0e97ff9b32095c84257697c54acef7;hp=d4bb0b818d3c6f2e732db1886a570a3858cbd023;hpb=3ef0c31c42ccc7ee998fffc9d31558e86749fc03;p=openssl-gost%2Fengine.git

diff --git a/.cirrus.yml b/.cirrus.yml
index d4bb0b8..7a0c3c9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,21 +1,20 @@
 FreeBSD_task:
   freebsd_instance:
-    image: freebsd-12-0-release-amd64
+    image_family: freebsd-12-1
   env:
-    ASSUME_ALWAYS_YES: TRUE # required for unattended "pkg" invocation
     PREFIX: ${HOME}/opt
-    LD_LIBRARY_PATH: ${PREFIX}/lib
     PATH: ${PREFIX}/bin:${PATH}
     OPENSSL_BRANCH: master
-  script:
-    - pkg install git cmake p5-App-cpanminus gdb
+  install_script:
+    - pkg install -y git cmake p5-App-cpanminus gdb pkgconf
     - sudo cpanm --notest Test2::V0
+  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
-    - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ..
+    - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ..
     - make
     - make test CTEST_OUTPUT_ON_FAILURE=1