Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update openssl version #972

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update openssl version #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a448a54
init
andreylzmw Mar 21, 2024
2f6a2a4
update
andreylzmw Apr 3, 2024
a9d35d5
reduce changes
andreylzmw Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/Build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:
cpp: 17
asan: off
ubsan: off
- os: focal
compiler: clang++
cpp: 17
asan: off
ubsan: on
- os: focal
compiler: g++-10
cpp: 20
asan: on
ubsan: off
# - os: focal
# compiler: clang++
# cpp: 17
# asan: off
# ubsan: on
# - os: focal
# compiler: g++-10
# cpp: 20
# asan: on
# ubsan: off
- os: jammy
compiler: g++
cpp: 20
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/Dockerfile.buster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,14 @@ RUN apt-get update && \
pip3 install -r /tmp/requirements.txt && \
apt-get install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \
libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
postgresql postgresql-server-dev-all libnuma-dev composer && \
postgresql postgresql-server-dev-all libnuma-dev composer perl && \
rm -rf /var/lib/apt/lists/* && \
update-alternatives --set php /usr/bin/php7.4
update-alternatives --set php /usr/bin/php7.4 && \
wget --no-check-certificate https://www.openssl.org/source/openssl-3.0.2.tar.gz && \
tar -xvzf openssl-3.0.2.tar.gz && \
cd openssl-3.0.2 && \
chmod +x ./config && \
./config --prefix="/usr/local/" && \
make -j$(nproc) && make install

RUN useradd -ms /bin/bash kitten
5 changes: 5 additions & 0 deletions cmake/init-compilation-flags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ else()
add_link_options(-fno-lto)
endif()

if(NOT APPLE)
set(OPENSSL_ROOT_DIR "/usr/local/" CACHE INTERNAL "")
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
# set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=64)
endif()
set(OPENSSL_USE_STATIC_LIBS TRUE)
find_package(OpenSSL REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
Expand Down
Loading