Skip to content

Commit

Permalink
fix: update tools to provide proper openssl 1.1.1 support for (alpine…
Browse files Browse the repository at this point in the history
…) linux
  • Loading branch information
maxirmx committed Feb 18, 2025
1 parent a518058 commit 82c218b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,5 +206,5 @@ jobs:
- name: Test
run: |
set -o errexit -o pipefail -o noclobber -o nounset
v=$(LD_LIBRARY_PATH="$PWD/build/setup-openssl/deps/lib":%LD_LIBRARY_PATH% build/setup-openssl/deps/bin/openssl version)
v=$(build/setup-openssl/deps/bin/openssl version)
[ "$v" = "OpenSSL 1.1.1w 11 Sep 2023" ]
5 changes: 4 additions & 1 deletion cmake-scripts/setup-openssl-1.1.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,11 @@ if(WITH_OPENSSL_BUILD)
BINARY_DIR ${OPENSSL_BINARY_DIR}
CONFIGURE_COMMAND ${GNU_BASH} -c "${OPENSSL_SOURCE_DIR}/config \
--openssldir=${DEPS} \
--prefix=${DEPS}"
--prefix=${DEPS} \
no-shared"
BUILD_BYPRODUCTS ${__LIBSSL} ${__LIBCRYPTO}
)

set(OPENSSL_ROOT_DIR "${DEPS}")

endif(WITH_OPENSSL_BUILD)
34 changes: 34 additions & 0 deletions dwarfs-test-helper/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Copyright (c) 2025, [Ribose Inc](https://www.ribose.com).
# All rights reserved.
# This file is a part of tebako
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.24.0)
project(setup-openssl)

include(ExternalProject)

set(GNU_BASH bash)

include(${ROOT}/tools/cmake-scripts/def-external-project.cmake)
include(${ROOT}/tools/cmake-scripts/setup-openssl-1.1.1.cmake)

0 comments on commit 82c218b

Please sign in to comment.