Stop overriding OPENSSL_LIBRARIES

Fix #346

diff --git a/.cirrus.yml b/.cirrus.yml
index 6e04657785adadd1f2299ad054e8dd44e4005caa..7a0c3c9322062110b28d257ee4163097bfc5691a 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -15,6 +15,6 @@ FreeBSD_task:
     - 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

diff --git a/.github/script.sh b/.github/script.sh
index dcc4ea8dde8317b3e5972a5fbf19406bf4064c0f..f8b053cb1d073d7febab65ce40852df8362dac8e 100755 (executable)
--- a/.github/script.sh
+++ b/.github/script.sh
@@ -5,7 +5,7 @@ PATH=$PREFIX/bin:$PATH
 
 mkdir build
 cd build
-cmake -DOPENSSL_ROOT_DIR=$PREFIX -DOPENSSL_LIBRARIES=$PREFIX/lib -DOPENSSL_ENGINES_DIR=$PREFIX/engines ${ASAN-} ..
+cmake -DOPENSSL_ROOT_DIR=$PREFIX -DOPENSSL_ENGINES_DIR=$PREFIX/engines ${ASAN-} ..
 make
 make test CTEST_OUTPUT_ON_FAILURE=1
 if [ -z "${ASAN-}" ]; then

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index dcefc07d8d4cd04a50e519aa5f179e4e60ea20db..07eb46ba3a3c09aabbc7f7dd906417a4ea592697 100644 (file)
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -69,7 +69,7 @@ jobs:
        set -e
        mkdir build
        cd build
-       cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ${ASAN} ..
+       cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ${ASAN} ..
        make
 
     - name: Perform CodeQL Analysis

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644 (file)
index afe3422..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-dist: bionic
-
-os: linux
-
-language: c
-
-env:
-  global:
-    - PREFIX=${HOME}/opt
-    - PATH=${PREFIX}/bin:${PATH}
-    - OPENSSL_BRANCH=openssl-3.0.0-alpha8
-    - RPATH="-Wl,-rpath=${PREFIX}/lib"
-
-matrix:
-  include:
-    - name: gcc | openssl-stable
-    - name: clang | openssl-stable
-      compiler: clang
-    - name: gcc | openssl-master
-      env: OPENSSL_BRANCH=master
-    # Dynamic and static analysers
-    - name: gcc+ASan | openssl-stable
-      env: ASAN=-DASAN=1
-    - name: gcc+Coverity | openssl-stable (cron)
-      env: COVERITY_SCAN_PROJECT_NAME="gost-engine" COVERITY_SCAN_BRANCH_PATTERN="*" COVERITY_SCAN_NOTIFICATION_EMAIL="beldmit@gmail.com" COVERITY_SCAN_BUILD_COMMAND="make"
-      if: type == cron
-      script:
-        - mkdir build
-        - cd build
-        - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ..
-        - curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true
-    # Other arches
-    - name: gcc | openssl-stable
-      env: CFLAGS=-m32 LDFLAGS=-m32 SETARCH="setarch i386" APT_INSTALL=gcc-multilib
-    - name: gcc | openssl-stable
-      arch: ppc64le
-    - name: gcc | openssl-stable
-      arch: arm64
-    - name: gcc | openssl-stable
-      arch: s390x
-    # Non-linux
-    - name: clang | openssl-stable
-      os: osx
-      compiler: clang
-      #env: RPATH="-Wl,-rpath,${PREFIX}/lib"
-  allow_failures:
-      env: OPENSSL_BRANCH=master
-      if: type == pull_request
-
-before_script:
-  - curl -L https://cpanmin.us | sudo perl - --sudo App::cpanminus
-  - 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; fi
-  - git clone --depth 1 -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
-  - cd openssl
-  - git describe --always --long
-  - $SETARCH ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} ${RPATH}
-  - travis_wait $SETARCH make -s -j$(nproc) build_libs
-  - travis_wait $SETARCH make -s -j$(nproc) build_programs
-  - make -s install_sw
-  - cd ..
-
-script:
-  - set -e
-  - 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