From 474f42f2a3277822a9f385a639ea8272df08c891 Mon Sep 17 00:00:00 2001 From: Levon Gevorgyan Date: Fri, 8 Aug 2025 16:55:51 -0500 Subject: [PATCH] continuing --- lib/build.sh | 5 +---- lib/docker.sh | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/build.sh b/lib/build.sh index 9b308e3..0b7cab6 100644 --- a/lib/build.sh +++ b/lib/build.sh @@ -84,10 +84,7 @@ set_compile_opts() { LDFLAGS+=('-static') CONFIGURE_FLAGS+=('--enable-static') CMAKE_FLAGS+=("-DBUILD_SHARED_LIBS=OFF") - MESON_FLAGS+=( - '--prefer-static' - '--default-library=static' - ) + MESON_FLAGS+=('--default-library=static') CMAKE_FLAGS+=("-DCMAKE_EXE_LINKER_FLAGS=-static") RUSTFLAGS+=("-C target-feature=+crt-static") PKG_CFG_FLAGS='--static' diff --git a/lib/docker.sh b/lib/docker.sh index b92b1b4..0700e53 100644 --- a/lib/docker.sh +++ b/lib/docker.sh @@ -221,6 +221,13 @@ docker_run_image() { "${image_tag}" \ rm -rf "${DOCKER_WORKDIR}"/gitignore 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_FLAGS[@]}" \