Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4ee3929

Browse files
committed
disable nodelete, see #381 
1 parent 893430f commit 4ee3929

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

‎docker/manylinux2014/Dockerfile_aarch64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN mkdir ~/ffmpeg_sources && \
2121
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
2222
tar -xf OpenSSL_1_1_1c.tar.gz && \
2323
cd openssl-OpenSSL_1_1_1c && \
24-
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
24+
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib -DOPENSSL_USE_NODELETE=0 && \
2525
make -j$(getconf _NPROCESSORS_ONLN) && \
2626
# skip installing documentation
2727
make install_sw && \

‎docker/manylinux2014/Dockerfile_i686‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN mkdir ~/ffmpeg_sources && \
2323
cd openssl-OpenSSL_1_1_1c && \
2424
# in i686, ./config detects x64 in i686 container without linux32
2525
# when run from "docker build"
26-
linux32 ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
26+
linux32 ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib -DOPENSSL_USE_NODELETE=0 && \
2727
make -j$(getconf _NPROCESSORS_ONLN) && \
2828
#skip installing documentation
2929
make install_sw && \

‎docker/manylinux2014/Dockerfile_x86_64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN mkdir ~/ffmpeg_sources && \
2121
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
2222
tar -xf OpenSSL_1_1_1c.tar.gz && \
2323
cd openssl-OpenSSL_1_1_1c && \
24-
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
24+
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib -DOPENSSL_USE_NODELETE=0 && \
2525
make -j$(getconf _NPROCESSORS_ONLN) && \
2626
# skip installing documentation
2727
make install_sw && \

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /