Set rpath via patchelf instead of build tools #32

Upgrade dependencies to latest: glib, svg

Author: lovell

build.sh

@@ -30,7 +30,7 @@ if ! type docker >/dev/null; then
 fi
 
 # Update base images
-for baseimage in centos:7 debian:stretch debian:bullseye alpine:3.10; do
+for baseimage in centos:7 debian:stretch debian:bullseye alpine:3.11; do
   docker pull $baseimage
 done
 

build/lin.sh

@@ -11,15 +11,15 @@ mkdir ${TARGET}
 export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${TARGET}/lib/pkgconfig"
 export PATH="${PATH}:${TARGET}/bin"
 export CPPFLAGS="-I${TARGET}/include"
-export LDFLAGS="-L${TARGET}/lib -Wl,-rpath='\$\$ORIGIN'"
+export LDFLAGS="-L${TARGET}/lib"
 export LD_LIBRARY_PATH="${TARGET}/lib"
 export CFLAGS="${FLAGS}"
 export CXXFLAGS="${FLAGS}"
 
 # Dependency version numbers
 VERSION_ZLIB=1.2.11
 VERSION_FFI=3.3
-VERSION_GLIB=2.63.2
+VERSION_GLIB=2.63.3
 VERSION_XML2=2.9.10
 VERSION_GSF=1.14.46
 VERSION_EXIF=0.6.21
@@ -40,7 +40,7 @@ VERSION_CAIRO=1.16.0
 VERSION_FRIBIDI=1.0.8
 VERSION_PANGO=1.44.7
 VERSION_CROCO=0.6.13
-VERSION_SVG=2.46.4
+VERSION_SVG=2.47.1
 VERSION_GIF=5.1.4
 
 # Remove patch version component
@@ -80,7 +80,7 @@ version_latest "pixman" "$VERSION_PIXMAN" "3648"
 version_latest "fribidi" "$VERSION_FRIBIDI" "857"
 version_latest "pango" "$VERSION_PANGO" "11783"
 version_latest "croco" "$VERSION_CROCO" "11787"
-#version_latest "svg" "$VERSION_SVG" "5420" # v2.47.0+ requires rust>=1.36 but rustup does not support musl
+version_latest "svg" "$VERSION_SVG" "5420"
 #version_latest "gif" "$VERSION_GIF" "1158" # v5.1.5+ provides a Makefile only so will require custom cross-compilation setup
 if [ "$ALL_AT_VERSION_LATEST" = "false" ]; then exit 1; fi
 
@@ -94,7 +94,7 @@ case ${PLATFORM} in *musl*)
   make install-strip
   rm ${TARGET}/include/gettext-po.h
   rm -rf ${TARGET}/lib/*gettext*
-  export LDFLAGS="-L${TARGET}/lib -lintl -Wl,-rpath='\$ORIGIN'"
+  export LDFLAGS="$LDFLAGS -lintl"
 esac
 
 mkdir ${DEPS}/zlib
@@ -189,6 +189,7 @@ CFLAGS= CXXFLAGS= meson setup _build --buildtype=release --strip --libdir=lib --
   -Dtiff=false -Dx11=false -Dgir=false -Dinstalled_tests=false -Dgio_sniffing=false -Dman=false -Dbuiltin_loaders=png,jpeg
 ninja -C _build
 ninja -C _build install
+rm -rf ${TARGET}/lib/gdk-pixbuf-2.0
 
 mkdir ${DEPS}/freetype
 curl -Ls https://download.savannah.gnu.org/releases/freetype/freetype-${VERSION_FREETYPE}.tar.xz | tar xJC ${DEPS}/freetype --strip-components=1
@@ -286,7 +287,10 @@ make install-strip
 cd ${TARGET}/include
 rm -rf vips/vipsc++.h vips/vipscpp.h
 cd ${TARGET}/lib
-rm -rf pkgconfig .libs *.la libvipsCC*
+rm -rf pkgconfig .libs *.la libvipsCC* cmake
+
+# Set RPATH to $ORIGIN
+find ${TARGET}/lib -type f -name "*.so*" -exec sh -c "patchelf --set-rpath '\$ORIGIN' --force-rpath {}" \;
 
 # Create JSON file of version numbers
 cd ${TARGET}

linux-arm64v8/Dockerfile

@@ -9,7 +9,7 @@ RUN \
   apt-get install -y curl && \
   dpkg --add-architecture arm64 && \
   apt-get update && \
-  apt-get install -y crossbuild-essential-arm64 autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake python3-pip ninja-build && \
+  apt-get install -y crossbuild-essential-arm64 autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake python3-pip ninja-build patchelf && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
   ~/.cargo/bin/rustup target add aarch64-unknown-linux-gnu && \
   pip3 install meson

linux-armv6/Dockerfile

@@ -9,7 +9,7 @@ RUN \
   apt-get install -y curl && \
   dpkg --add-architecture armhf && \
   apt-get update && \
-  apt-get install -y autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake python3-pip ninja-build && \
+  apt-get install -y autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake python3-pip ninja-build patchelf && \
   mkdir /root/tools && \
   curl -Ls https://github.com/rvagg/rpi-newer-crosstools/archive/master.tar.gz | tar xzC /root/tools --strip-components=1 && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \

linux-armv7/Dockerfile

@@ -9,7 +9,7 @@ RUN \
   apt-get install -y curl && \
   dpkg --add-architecture armhf && \
   apt-get update && \
-  apt-get install -y crossbuild-essential-armhf autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake python3-pip ninja-build && \
+  apt-get install -y crossbuild-essential-armhf autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake python3-pip ninja-build patchelf && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
   ~/.cargo/bin/rustup target add arm-unknown-linux-gnueabihf && \
   pip3 install meson

linux-x64/Dockerfile

@@ -20,6 +20,7 @@ RUN \
     jq \
     nasm \
     prelink \
+    patchelf \
     ninja-build && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
   ln -s /usr/bin/cmake3 /usr/bin/cmake && \

linuxmusl-x64/Dockerfile

@@ -1,15 +1,15 @@
-FROM alpine:3.10
+FROM alpine:3.11
 MAINTAINER Lovell Fuller <[email protected]>
 
-# Create Alpine 3.10 (musl 1.1.22) container suitable for building Linux x64 binaries
+# Create Alpine 3.11 (musl 1.1.24) container suitable for building Linux x64 binaries
 
 # Build dependencies
 RUN \
   apk update && apk upgrade && \
   apk --update --no-cache add \
     build-base curl git autoconf automake libtool intltool shared-mime-info nasm gtk-doc \
-    texinfo gperf glib-dev gobject-introspection-dev findutils jq linux-headers cmake binutils python3 ninja && \
-  apk --update --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.10/community/ add cargo && \
+    texinfo gperf glib-dev gobject-introspection-dev findutils jq linux-headers cmake binutils python3 ninja patchelf && \
+  apk --update --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.11/community/ add cargo && \
   apk --update --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/edge/testing/ add advancecomp && \
   pip3 install meson