File tree Expand file tree Collapse file tree 3 files changed +6
-17
lines changed Expand file tree Collapse file tree 3 files changed +6
-17
lines changed Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ if(MSVC)
35
35
winmm
36
36
)
37
37
else ()
38
- target_link_libraries (Server PRIVATE dl)
38
+ target_link_libraries (Server PRIVATE dl atomic )
39
39
40
40
if (SHARED_STDCXXFS)
41
41
target_link_libraries (Server PRIVATE stdc++fs)
Original file line number Diff line number Diff line change 7
7
wget \
8
8
libstdc++6:i386 \
9
9
tzdata \
10
- && \
11
- wget \
12
- http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb \
13
- -P /tmp \
14
- && \
15
- dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb && \
16
- wget \
17
- http://security.ubuntu.com/ubuntu/pool/main/o/openssl/openssl_1.1.1f-1ubuntu2.16_i386.deb \
18
- -P /tmp \
19
- && \
20
- dpkg -i /tmp/openssl_1.1.1f-1ubuntu2.16_i386.deb && \
21
- rm \
22
- /tmp/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb \
23
- /tmp/openssl_1.1.1f-1ubuntu2.16_i386.deb \
10
+ openssl \
11
+ libssl3 \
12
+ libssl-dev \
24
13
&& \
25
14
useradd -m user
26
15
Original file line number Diff line number Diff line change @@ -118,10 +118,10 @@ conan_omp_add_lib(nlohmann_json 3.9.1)
118
118
# -------
119
119
if (SHARED_OPENSSL)
120
120
message ("Using shared OpenSSL" )
121
- conan_omp_add_lib_opt(openssl 1.1.1q "openssl:shared=True" )
121
+ conan_omp_add_lib_opt(openssl 3.0.13 "openssl:shared=True" )
122
122
else ()
123
123
message ("Using static OpenSSL" )
124
- conan_omp_add_lib(openssl 1.1.1q )
124
+ conan_omp_add_lib(openssl 3.0.13 )
125
125
endif ()
126
126
127
127
# ghc-filesystem
You can’t perform that action at this time.
0 commit comments