Skip to content

Commit cb0ea95

Browse files
Fix openssl library paths in php-wasm build (#102)
1 parent 81db60b commit cb0ea95

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

packages/php-wasm/compile/php/Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,9 @@ fi
5757
COPY ./libopenssl/ /root/builds-libopenssl/
5858
RUN mkdir -p /libs/libopenssl
5959
RUN if [ "$WITH_JSPI" = "yes" ]; then \
60-
cp -r /root/builds-libopenssl/jspi/dist/1.1.0h/root/lib /libs/libopenssl/1.1.0h; \
61-
cp -r /root/builds-libopenssl/jspi/dist/1.1.1/root/lib /libs/libopenssl/1.1.1; \
60+
cp -r /root/builds-libopenssl/jspi/dist/root/lib /libs/libopenssl; \
6261
else \
63-
cp -r /root/builds-libopenssl/asyncify/dist/1.1.0h/root/lib /libs/libopenssl/1.1.0h; \
64-
cp -r /root/builds-libopenssl/asyncify/dist/1.1.1/root/lib /libs/libopenssl/1.1.1; \
62+
cp -r /root/builds-libopenssl/asyncify/dist/root/lib /libs/libopenssl; \
6563
fi
6664

6765
# Build PHP
@@ -202,11 +200,7 @@ RUN if [ "$WITH_GD" = "yes" ]; \
202200
# Add openssl if needed
203201
RUN if [ "$WITH_OPENSSL" = "yes" ]; \
204202
then \
205-
if [[ "${PHP_VERSION:0:1}" -lt "8" || ("${PHP_VERSION:0:1}" -eq "8" && "${PHP_VERSION:2:1}" -lt "4") ]]; then \
206-
cp -r /libs/libopenssl/1.1.0h/* /root/lib; \
207-
else \
208-
cp -r /libs/libopenssl/1.1.1/* /root/lib; \
209-
fi; \
203+
cp -r /libs/libopenssl/* /root/lib; \
210204
echo -n ' --with-openssl --with-openssl-dir=/root/lib ' >> /root/.php-configure-flags; \
211205
echo -n ' -lssl -lcrypto ' >> /root/.emcc-php-wasm-flags; \
212206
fi;

0 commit comments

Comments
 (0)