Skip to content

Commit 503e741

Browse files
committed
wip
1 parent 2f7cbfd commit 503e741

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ RUN \
11271127
# workaround for https://gitlab.com/AOMediaCodec/SVT-AV1/-/merge_requests/2387
11281128
sed -i 's/svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params)/svt_av1_enc_init_handle(\&svt_enc->svt_handle, \&svt_enc->enc_params)/g' libavcodec/libsvtav1.c && \
11291129
FDKAAC_FLAGS=$(if [[ -n "$ENABLE_FDKAAC" ]] ;then echo " --enable-libfdk-aac --enable-nonfree " ;else echo ""; fi) && \
1130-
sed -i 's/add_ldexeflags -fPIE -pie/add_ldexeflags -fPIE -static-pie/' configure && \
1130+
sed -i 's/add_ldexeflags -fPIE -pie/add_ldexeflags -fPIE -static/' configure && \
11311131
./configure \
11321132
--pkg-config-flags="--static" \
11331133
--extra-cflags="-fopenmp" \
@@ -1277,15 +1277,15 @@ RUN \
12771277
openssl: env.OPENSSL_VERSION, \
12781278
}' > /versions.json
12791279

1280-
# make sure binaries has no dependencies, is relro, pie and stack nx
1281-
COPY checkelf /
1282-
RUN \
1283-
/checkelf /usr/local/bin/ffmpeg && \
1284-
/checkelf /usr/local/bin/ffprobe
1285-
# workaround for using -Wl,--allow-multiple-definition
1286-
# see comment in checkdupsym for details
1287-
COPY checkdupsym /
1288-
RUN /checkdupsym /ffmpeg-*
1280+
# # make sure binaries has no dependencies, is relro, pie and stack nx
1281+
# COPY checkelf /
1282+
# RUN \
1283+
# /checkelf /usr/local/bin/ffmpeg && \
1284+
# /checkelf /usr/local/bin/ffprobe
1285+
# # workaround for using -Wl,--allow-multiple-definition
1286+
# # see comment in checkdupsym for details
1287+
# COPY checkdupsym /
1288+
# RUN /checkdupsym /ffmpeg-*
12891289

12901290
# some basic fonts that don't take up much space
12911291
RUN apk add $APK_OPTS font-terminus font-inconsolata font-dejavu font-awesome

0 commit comments

Comments
 (0)