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 c001042

Browse files
committed
update openssl, no-pinshared, see #381 
1 parent 4ee3929 commit c001042

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎docker/manylinux2014/Dockerfile_aarch64‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ ENV PATH "$QTDIR/bin:$PATH"
1818

1919
RUN mkdir ~/ffmpeg_sources && \
2020
cd ~/ffmpeg_sources && \
21-
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
22-
tar -xf OpenSSL_1_1_1c.tar.gz && \
23-
cd openssl-OpenSSL_1_1_1c && \
24-
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib -DOPENSSL_USE_NODELETE=0 && \
21+
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz && \
22+
tar -xf OpenSSL_1_1_1g.tar.gz && \
23+
cd openssl-OpenSSL_1_1_1g && \
24+
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
2525
make -j$(getconf _NPROCESSORS_ONLN) && \
2626
# skip installing documentation
2727
make install_sw && \

‎docker/manylinux2014/Dockerfile_i686‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ ENV PATH "$QTDIR/bin:$PATH"
1818

1919
RUN mkdir ~/ffmpeg_sources && \
2020
cd ~/ffmpeg_sources && \
21-
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
22-
tar -xf OpenSSL_1_1_1c.tar.gz && \
23-
cd openssl-OpenSSL_1_1_1c && \
21+
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz && \
22+
tar -xf OpenSSL_1_1_1g.tar.gz && \
23+
cd openssl-OpenSSL_1_1_1g && \
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 -DOPENSSL_USE_NODELETE=0 && \
26+
linux32 ./config --prefix="$HOME/ffmpeg_build" no-pinshared shared zlib && \
2727
make -j$(getconf _NPROCESSORS_ONLN) && \
2828
#skip installing documentation
2929
make install_sw && \

‎docker/manylinux2014/Dockerfile_x86_64‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ ENV PATH "$QTDIR/bin:$PATH"
1818

1919
RUN mkdir ~/ffmpeg_sources && \
2020
cd ~/ffmpeg_sources && \
21-
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
22-
tar -xf OpenSSL_1_1_1c.tar.gz && \
23-
cd openssl-OpenSSL_1_1_1c && \
24-
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib -DOPENSSL_USE_NODELETE=0 && \
21+
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz && \
22+
tar -xf OpenSSL_1_1_1g.tar.gz && \
23+
cd openssl-OpenSSL_1_1_1g && \
24+
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
2525
make -j$(getconf _NPROCESSORS_ONLN) && \
2626
# skip installing documentation
2727
make install_sw && \

0 commit comments

Comments
(0)

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