X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.github%2Fbefore_script.sh;h=2164d7f7f897079b671713d5bd8cd1ba37944c09;hb=95eaf6688d024161f4f41307e5f439d52efcc87a;hp=7a86543452e7be130ebd7becf40e0e5df3ca0019;hpb=42a6213fe3bab6003121069ef28a1419e2342b3c;p=openssl-gost%2Fengine.git

diff --git a/.github/before_script.sh b/.github/before_script.sh
index 7a86543..2164d7f 100755
--- a/.github/before_script.sh
+++ b/.github/before_script.sh
@@ -1,7 +1,11 @@
 #!/bin/bash -efux
 
-curl -L https://cpanmin.us | sudo perl - --sudo App::cpanminus
-sudo cpanm --notest Test2::V0 > build.log 2>&1 || (cat build.log && exit 1)
+# Download cpanm and make it executable as a standalone script
+curl -L https://cpanmin.us -o cpanm
+chmod 0755 cpanm
+
+sudo ./cpanm --notest Test2::V0 > build.log 2>&1 \
+    || (cat build.log && exit 1)
 
 if [ "${APT_INSTALL-}" ]; then
     sudo apt-get install -y $APT_INSTALL
@@ -13,7 +17,7 @@ git describe --always --long
 
 PREFIX=$HOME/opt
 
-${SETARCH-} ./config shared -d --prefix=$PREFIX --openssldir=$PREFIX -Wl,-rpath=$PREFIX/lib
+${SETARCH-} ./config shared -d --prefix=$PREFIX --libdir=lib --openssldir=$PREFIX ${USE_RPATH:+-Wl,-rpath=$PREFIX/lib}
 ${SETARCH-} make -s -j$(nproc) build_libs
 ${SETARCH-} make -s -j$(nproc) build_programs
 make -s install_sw