From 8df6a4b92dd1323e3ee06faab44712b207ceadb1 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 13 May 2021 17:35:45 +0200
Subject: [PATCH] Enable shared linux programs (EXPERIMENTAL)

---
 README.md                        |  5 +++--
 build.sh                         |  4 ++--
 scripts.d/99-staticify.sh        | 18 +++++-------------
 variants/linux-install-shared.sh |  4 ++--
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 54ebe8b..5967e9c 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,9 @@
 
 Static Windows Builds of ffmpeg master and latest release branch.
 
-EXPERIMENTAL Linux-Builds. Do not expect everything to work on them, specially anything that involved loading dynamic libs at runtime.
-Shared Linux builds come without the programs (hopefully just for now), since they won't run without musl.
+EXPERIMENTAL Linux-Builds. Do not expect everything to work on them, specially anything that involves loading dynamic libs at runtime.
+Shared Linux builds need musl installed to run the programs. YMMV when trying to use the libraries.
+Please report any issues you encounter with those builds!
 
 ## Auto-Builds
 
diff --git a/build.sh b/build.sh
index fbfe048..ae899da 100755
--- a/build.sh
+++ b/build.sh
@@ -57,8 +57,8 @@ docker run --rm -i "${UIDARGS[@]}" -v $PWD/ffbuild:/ffbuild "$IMAGE" bash -s <<E
     cd ffmpeg
     git checkout $GIT_BRANCH
 
-    ./configure --prefix=/ffbuild/prefix --pkg-config-flags="--static" \$FFBUILD_TARGET_FLAGS $FF_CONFIGURE --extra-cflags="$FF_CFLAGS" --extra-cxxflags="$FF_CXXFLAGS" --extra-ldflags="$FF_LDFLAGS" --extra-libs="$FF_LIBS"
-    make -j\$(nproc)
+    ./configure --prefix=/ffbuild/prefix --pkg-config-flags="--static" \$FFBUILD_TARGET_FLAGS $FF_CONFIGURE --extra-cflags='$FF_CFLAGS' --extra-cxxflags='$FF_CXXFLAGS' --extra-ldflags='$FF_LDFLAGS' --extra-libs='$FF_LIBS'
+    make -j\$(nproc) V=1
     make install install-doc
 EOF
 
diff --git a/scripts.d/99-staticify.sh b/scripts.d/99-staticify.sh
index 2c807c5..30f6163 100755
--- a/scripts.d/99-staticify.sh
+++ b/scripts.d/99-staticify.sh
@@ -21,22 +21,14 @@ ffbuild_dockerbuild() {
 }
 
 ffbuild_ldflags() {
-    if [[ $VARIANT == *shared* ]]; then
-        #if [[ $TARGET == *64* ]]; then
-        #    echo "-Wl,--dynamic-linker=/lib64/ld-linux-x86-64.so.2"
-        #else
-        #    echo "-Wl,--dynamic-linker=/lib/ld-linux.so.2"
-        #fi
-        return 0
-    else
+    if [[ $VARIANT != *shared* ]]; then
         echo "-pie -fPIE -static"
     fi
 }
 
 ffbuild_configure() {
-    # Any dynamic executables linked against musl need its dynamic loader to run
-    # Thus it's impossible to build both the libraries and the programs, since
-    # with shared libs, the programs need to be dynamic, and in turn needs the musl
-    # dynamic loader at runtime.
-    [[ $VARIANT == *shared* ]] && echo --disable-programs
+    if [[ $VARIANT == *shared* ]]; then
+        # Can't escape hell
+        echo --extra-ldexeflags=\'-Wl,-rpath='\\\\\\\$\\\$ORIGIN'\\ -Wl,-rpath='\\\\\\\$\\\$ORIGIN/../lib'\'
+    fi
 }
diff --git a/variants/linux-install-shared.sh b/variants/linux-install-shared.sh
index b5e77bd..d8ac92e 100644
--- a/variants/linux-install-shared.sh
+++ b/variants/linux-install-shared.sh
@@ -4,8 +4,8 @@ package_variant() {
     IN="$1"
     OUT="$2"
 
-    # mkdir -p "$OUT"/bin
-    # cp "$IN"/bin/* "$OUT"/bin
+    mkdir -p "$OUT"/bin
+    cp "$IN"/bin/* "$OUT"/bin
 
     mkdir -p "$OUT"/lib
     cp -a "$IN"/lib/*.so* "$OUT"/lib