mirror of
https://github.com/levogevo/ffmpeg-builder.git
synced 2026-01-15 19:06:17 +00:00
continuing
This commit is contained in:
@@ -84,10 +84,7 @@ set_compile_opts() {
|
|||||||
LDFLAGS+=('-static')
|
LDFLAGS+=('-static')
|
||||||
CONFIGURE_FLAGS+=('--enable-static')
|
CONFIGURE_FLAGS+=('--enable-static')
|
||||||
CMAKE_FLAGS+=("-DBUILD_SHARED_LIBS=OFF")
|
CMAKE_FLAGS+=("-DBUILD_SHARED_LIBS=OFF")
|
||||||
MESON_FLAGS+=(
|
MESON_FLAGS+=('--default-library=static')
|
||||||
'--prefer-static'
|
|
||||||
'--default-library=static'
|
|
||||||
)
|
|
||||||
CMAKE_FLAGS+=("-DCMAKE_EXE_LINKER_FLAGS=-static")
|
CMAKE_FLAGS+=("-DCMAKE_EXE_LINKER_FLAGS=-static")
|
||||||
RUSTFLAGS+=("-C target-feature=+crt-static")
|
RUSTFLAGS+=("-C target-feature=+crt-static")
|
||||||
PKG_CFG_FLAGS='--static'
|
PKG_CFG_FLAGS='--static'
|
||||||
|
|||||||
@@ -221,6 +221,13 @@ docker_run_image() {
|
|||||||
"${image_tag}" \
|
"${image_tag}" \
|
||||||
rm -rf "${DOCKER_WORKDIR}"/gitignore
|
rm -rf "${DOCKER_WORKDIR}"/gitignore
|
||||||
fi
|
fi
|
||||||
|
testfile="${PREFIX}/ffmpeg-build-testfile"
|
||||||
|
if ! touch "${testfile}" 2>/dev/null; then
|
||||||
|
docker run \
|
||||||
|
"${DOCKER_RUN_FLAGS[@]}" \
|
||||||
|
"${image_tag}" \
|
||||||
|
rm -rf "${DOCKER_WORKDIR}"/gitignore
|
||||||
|
fi
|
||||||
|
|
||||||
docker run \
|
docker run \
|
||||||
"${DOCKER_RUN_FLAGS[@]}" \
|
"${DOCKER_RUN_FLAGS[@]}" \
|
||||||
|
|||||||
Reference in New Issue
Block a user