Use dynamic implib wrapper for all X11 libs

images/base-linux64/Dockerfile

@@ -27,8 +27,11 @@ RUN \
         -delete && \
     mkdir /opt/ffbuild
 
+RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib
+
 ADD toolchain.cmake /toolchain.cmake
 ADD cross.meson /cross.meson
+ADD gen-implib.sh /usr/bin/gen-implib
 
 ENV PATH="/opt/ct-ng/bin:${PATH}" \
     FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-ffbuild-linux-gnu- --arch=x86_64 --target-os=linux" \

images/base-linux64/gen-implib.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+if [[ $# != 2 ]]; then
+    echo "Invalid arguments"
+    exit 1
+fi
+IN="$1"
+OUT="$2"
+
+TMPDIR="$(mktemp -d)"
+trap "rm -rf '$TMPDIR'" EXIT
+cd "$TMPDIR"
+
+set -x
+python3 /opt/implib/implib-gen.py --target x86_64-linux-gnu --dlopen --lazy-load --verbose "$IN"
+${FFBUILD_CROSS_PREFIX}gcc $CFLAGS $STAGE_CFLAGS -c *.tramp.S *.init.c
+${FFBUILD_CROSS_PREFIX}ar -rcs "$OUT" *.tramp.o *.init.o

images/base/run_stage.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -xe
 
+export RAW_CFLAGS="$CFLAGS"
+export RAW_CXXFLAGS="$CXXFLAGS"
+export RAW_LDFLAGS="$LDFLAGS"
 [[ -n "$STAGE_CFLAGS" ]] && export CFLAGS="$CFLAGS $STAGE_CFLAGS"
 [[ -n "$STAGE_CXXFLAGS" ]] && export CXXFLAGS="$CXXFLAGS $STAGE_CXXFLAGS"
 [[ -n "$STAGE_LDFLAGS" ]] && export LDFLAGS="$LDFLAGS $STAGE_LDFLAGS"

scripts.d/45-x11/20-libxau.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
     )
 
@@ -30,7 +30,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXau.so.6,libXau.a}
 }

scripts.d/45-x11/30-libxcb.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
         --disable-devel-docs
     )
@@ -31,9 +31,16 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    for LIBNAME in "$FFBUILD_PREFIX"/lib/libxcb*.so.?; do
+        gen-implib "$LIBNAME" "${LIBNAME%%.*}.a"
+    done
 }
 
 ffbuild_configure() {

scripts.d/45-x11/40-libx11.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
         --without-xmlto
         --without-fop
@@ -36,9 +36,15 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
 
-    echo "Libs.private: -ldl" >> "$FFBUILD_PREFIX"/lib/pkgconfig/x11.pc
+    echo "Libs: -ldl" >> "$FFBUILD_PREFIX"/lib/pkgconfig/x11.pc
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libX11-xcb.so.1,libX11-xcb.a}
+    gen-implib "$FFBUILD_PREFIX"/lib/{libX11.so.6,libX11.a}
 }

scripts.d/45-x11/50-libxext.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
         --without-xmlto
         --without-fop
@@ -34,7 +34,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXext.so.6,libXext.a}
 }

scripts.d/45-x11/50-libxfixes.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
     )
 
@@ -30,7 +30,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXfixes.so.3,libXfixes.a}
 }

scripts.d/45-x11/50-libxi.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
     )
 
@@ -30,7 +30,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXi.so.6,libXi.a}
 }

scripts.d/45-x11/50-libxinerama.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
     )
 
@@ -30,7 +30,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXinerama.so.1,libXinerama.a}
 }

scripts.d/45-x11/50-libxrender.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
     )
 
@@ -30,7 +30,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXrender.so.1,libXrender.a}
 }

scripts.d/45-x11/50-libxscrnsaver.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
     )
 
@@ -30,7 +30,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXss.so.1,libXss.a}
 }

scripts.d/45-x11/50-libxxf86vm.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
     )
 
@@ -30,7 +30,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXxf86vm.so.1,libXxf86vm.a}
 }

scripts.d/45-x11/60-libglvnd.sh

@@ -36,11 +36,7 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    export LDFLAGS="$LDFLAGS -lxcb -lXau"
-
     meson "${myconf[@]}" ..
     ninja -j"$(nproc)"
     ninja install
-
-    rm "$FFBUILD_PREFIX"/lib/lib*.so*
 }

scripts.d/45-x11/60-libxcursor.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
     )
 
@@ -30,7 +30,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
-    make -j$(nproc)
+    make -j$(nproc) VERBOSE=1
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXcursor.so.1,libXcursor.a}
 }

scripts.d/45-x11/60-libxrandr.sh

@@ -16,8 +16,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
     )
 
@@ -30,7 +30,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXrandr.so.2,libXrandr.a}
 }

scripts.d/45-x11/60-libxv.sh

@@ -17,8 +17,8 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
-        --disable-shared
+        --enable-shared
-        --enable-static
+        --disable-static
         --with-pic
         --without-lint
     )
@@ -32,9 +32,14 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
+    export CFLAGS="$RAW_CFLAGS"
+    export LDFLAFS="$RAW_LDFLAGS"
+
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
+
+    gen-implib "$FFBUILD_PREFIX"/lib/{libXv.so.1,libXv.a}
 }
 
 ffbuild_configure() {

scripts.d/45-x11/99-finalize.sh

@@ -11,5 +11,9 @@ ffbuild_dockerlayer() {
 }
 
 ffbuild_dockerbuild() {
-    true
+    rm "$FFBUILD_PREFIX"/lib/lib*.so*
+}
+
+ffbuild_libs() {
+    echo -ldl
 }