Merge pull request tectonic-typesetting#11 from pkgw/add-x86_64-musl

Add x86_64-unknown-linux-musl to the `cross` framework

Author: pkgw

.azure-pipelines/variables.yml

@@ -9,3 +9,4 @@ variables:
   windows_image: 'windows-2019'
   cross_tag: 'v0.1.16'
   target_arm_unknown_linux_musleabihf: 'arm-unknown-linux-musleabihf'
+  target_x86_64_unknown_linux_musl: 'x86_64-unknown-linux-musl'

cross-images/03_alpine_populate.sh

@@ -4,21 +4,27 @@ set -x
 set -euo pipefail
 
 TARGET_ARCH="$1"
-root=/home/rust/sysroot-$TARGET_ARCH
 
-# Packages for other architectures are signed with other keys that we need to load up.
-cd /etc/apk/keys
-for fp in 524d27bb ; do
-    wget https://alpinelinux.org/keys/[email protected]$fp.rsa.pub
-done
+if [ $TARGET_ARCH == native ] ; then
+    root=/
+else
+    root=/home/rust/sysroot-$TARGET_ARCH
 
-# Propagate the new keys into the sysroot and also tell it to start pulling in
-# packages from the internet.
-cp /etc/apk/keys/* $root/etc/apk/keys/
-cp /etc/apk/repositories $root/etc/apk/
+    # Packages for other architectures are signed with other keys that we need to load up.
+    cd /etc/apk/keys
+    for fp in 4d07755e 524d27bb 58199dcc 58cbb476 58e4f17d ; do
+        wget https://alpinelinux.org/keys/[email protected]$fp.rsa.pub
+    done
+
+    # Propagate the new keys into the sysroot and also tell it to start pulling in
+    # packages from the internet.
+    cp /etc/apk/keys/* $root/etc/apk/keys/
+    cp /etc/apk/repositories $root/etc/apk/
+fi
 
 # g++ is needed to get libstdc++.a, annoyingly
 apk --root $root add --no-scripts \
+    bzip2-dev \
     expat-dev \
     fontconfig-dev \
     freetype-dev \
@@ -36,7 +42,9 @@ apk --root $root add --no-scripts \
     openssl-dev \
     zlib-dev
 
-# Let's also install those cross-compilers!
-apk add build-base-$TARGET_ARCH gcc-$TARGET_ARCH g++-$TARGET_ARCH
+if [ $TARGET_ARCH != native ] ; then
+    # Let's also install those cross-compilers!
+    apk add build-base-$TARGET_ARCH gcc-$TARGET_ARCH g++-$TARGET_ARCH
+fi
 
 rm -f "$0"  # self-destruct

cross-images/05_ubuntu_unpriv_setup.sh

@@ -13,18 +13,15 @@ cd
 mkdir $HOME/bin
 
 for tmpl in toolwrapper.sh linkwrapper.sh ; do
-    sed -e "s|@rust_platform@|$rust_platform|g" -e "s|@os_platform@|$os_platform|g" -e "s|@toolprefix@|$toolprefix|g" $tmpl.in >bin/$tmpl
+    sed -e "s|@rust_platform@|$rust_platform|g" \
+        -e "s|@os_platform@|$os_platform|g" \
+        -e "s|@toolprefix@|$toolprefix|g" \
+        $tmpl.in >bin/$tmpl
     chmod +x bin/$tmpl
 done
 
 for tool in ar gcc g++ ld pkg-config ; do
-    ln -s toolwrapper.sh $HOME/bin/$rust_platform-$tool
+    ln -s toolwrapper.sh $HOME/bin/wrapped-$tool
 done
 
-# cat <<EOF >$HOME/bin/pkg-config
-# #! /bin/bash
-# exec $rust_platform-pkg-config "\$@"
-# EOF
-# chmod +x $HOME/bin/pkg-config
-
 rm -f "$0"  # self-destruct

cross-images/06_setup_env.sh

@@ -12,27 +12,47 @@ qemu_arch="$4"
 
 urp="$(echo $rust_platform |tr - _)"
 crp="$(echo $urp |tr '[a-z]' '[A-Z]')"
-sysroot=/alpine/home/rust/sysroot-$os_arch
 
-cat <<EOF >/environ
-export AR_${urp}=${rust_platform}-ar
-export CC_${urp}=${rust_platform}-gcc
-export CXX_${urp}=${rust_platform}-g++
+if [ $os_arch = native ] ; then
+    sysroot=/alpine
+else
+    sysroot=/alpine/home/rust/sysroot-$os_arch
+fi
 
-export CARGO_TARGET_${crp}_LINKER=/alpine/home/rust/bin/linkwrapper.sh
-export CARGO_TARGET_${crp}_RUNNER=qemu-${qemu_arch}
+RUSTFLAGS="-C target-feature=+crt-static -L ${sysroot}/usr/lib"
 
-export OPENSSL_DIR=${sysroot}/usr
+for tectonic_implicit_dep in bz2 expat uuid stdc++ ; do
+    RUSTFLAGS="$RUSTFLAGS -l static=${tectonic_implicit_dep}"
+done
 
+if [ "$rust_platform" = aarch64-unknown-linux-musl ] ; then
+    # Monkey-see, monkey-do workaround for
+    # https://github.com/rust-lang/rust/issues/46651 copied from `cross`.
+    RUSTFLAGS="$RUSTFLAGS -C link-arg=-lgcc"
+fi
+
+cat <<EOF >/environ
 export PATH=/alpine/home/rust/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-export PKG_CONFIG_ALLOW_CROSS=1
+export AR_${urp}=wrapped-ar
+export CC_${urp}=wrapped-gcc
+export CXX_${urp}=wrapped-g++
+export CARGO_TARGET_${crp}_LINKER=/alpine/home/rust/bin/linkwrapper.sh
+
+export OPENSSL_DIR=${sysroot}/usr
 export PKG_CONFIG_LIBDIR=${sysroot}/usr/lib/pkgconfig
 export PKG_CONFIG_SYSROOT_DIR=${sysroot}
 
-export RUSTFLAGS="-L ${sysroot}/usr/lib -l static=expat -l static=bz2 -l static=uuid -l static=stdc++ -C target-feature=+crt-static"
-
+export RUSTFLAGS="$RUSTFLAGS"
+export PKG_CONFIG_ALLOW_CROSS=1
 export RUST_TEST_THREADS=1
+export RUST_BACKTRACE=1
+EOF
+
+if [ $qemu_arch != native ] ; then
+    cat <<EOF >>/environ
+export CARGO_TARGET_${crp}_RUNNER=qemu-${qemu_arch}
 EOF
+fi
 
 rm -f "$0"  # self-destruct

cross-images/Dockerfile.alpine-chroot

@@ -0,0 +1,53 @@
+# Copyright 2019 The Tectonic Project
+# Licensed under the MIT License.
+
+# We do some fancy Docker gymnastics to set up an Alpine instance that then
+# becomes a chroot inside an Ubuntu install. Unlike
+# `Dockerfile.alpine-chroot-cross`, though, we don't need to install our own
+# cross-compiler or anything.
+
+FROM alpine:3.10 AS chroot
+
+ARG UID=1000
+ARG rust_platform
+ARG alpine_platform
+
+# Privileged Alpine setup: make an unprivileged user to work inside the
+# chroot. This script also sets up that user build packages, which we don't
+# need but is quick so there's no point forking the script.
+RUN apk update && apk add --update alpine-sdk
+ADD 01_alpine_priv_setup.sh /
+RUN sh /01_alpine_priv_setup.sh "$UID"
+
+# Now populate the Alpine environment with the packages Tectonic needs.
+ADD 03_alpine_populate.sh /
+RUN sh /03_alpine_populate.sh native
+
+# We're done setting up Alpine. Now switch to an Ubuntu image and embed
+# the Alpine system in it.
+FROM ubuntu:18.04
+ARG UID=1000
+ARG rust_platform
+ARG alpine_platform
+COPY --from=chroot / /alpine
+
+# Privileged Ubuntu setup
+ADD 04_ubuntu_priv_setup.sh /
+ADD enter-chroot /alpine/
+RUN sh /04_ubuntu_priv_setup.sh "$UID"
+
+# Unprivileged Ubuntu setup
+ADD toolwrapper.sh.in /alpine/home/rust/
+ADD linkwrapper.sh.in /alpine/home/rust/
+ADD --chown=rust 05_ubuntu_unpriv_setup.sh /alpine/home/rust/
+RUN sudo -iu rust sh /alpine/home/rust/05_ubuntu_unpriv_setup.sh $rust_platform $alpine_platform /usr/bin/
+
+# Set up the custom environment variables we need -- some of their names are
+# build args, so we can't use `ENV` as far as I can tell.
+COPY 06_setup_env.sh /
+RUN sh /06_setup_env.sh $rust_platform $alpine_platform native native
+
+WORKDIR /project
+ADD entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["cargo", "test", "--release", "--all"]

cross-images/Dockerfile.alpine-chroot-cross

@@ -53,7 +53,9 @@ COPY qemu.sh /
 RUN /qemu.sh $qemu_arch
 
 # Set up the custom environment variables we need -- some of their names are
-# build args, so we can't use `ENV` as far as I can tell.
+# build args, so we can't use `ENV` as far as I can tell. NOTE: intentionally
+# not quoting $qemu_arch here, so that the script only gets the arch name
+# in $4 in cases when $qemu_arch has two words (like ppc64le)
 COPY 06_setup_env.sh /
 RUN sh /06_setup_env.sh $rust_platform $alpine_platform $alpine_arch $qemu_arch
 

cross-images/build.x86_64-unknown-linux-musl.sh

@@ -0,0 +1,15 @@
+#! /usr/bin/env bash
+# Copyright 2019 The Tectonic Project
+# Licensed under the MIT License.
+
+[ -n "$IMGUID" ] || IMGUID="$(id -u)"
+rust_platform=x86_64-unknown-linux-musl
+alpine_platform=x86_64-alpine-linux-musl
+
+cd "$(dirname $0)" && exec docker build \
+       -t tectonictypesetting/crossbuild:$rust_platform \
+       -f Dockerfile.alpine-chroot \
+       --build-arg UID=$IMGUID \
+       --build-arg rust_platform=$rust_platform \
+       --build-arg alpine_platform=$alpine_platform \
+       .

cross-images/linkwrapper.sh.in

@@ -25,4 +25,5 @@ for arg in "$@"; do
     fi
 done
 
-exec $rust_platform-g++ "${args[@]}"
+set -x
+exec wrapped-g++ "${args[@]}"

cross-images/mini-aports/scripts/bootstrap.sh

@@ -53,8 +53,6 @@ EOF
 	return 1
 fi
 
-set -x # XXXXXXXXXXX
-
 if [ ! -d "$CBUILDROOT" ]; then
 	msg "Creating sysroot in $CBUILDROOT"
 	mkdir -p "$CBUILDROOT/etc/apk/keys"
@@ -65,10 +63,7 @@ fi
 msg "Building cross-compiler"
 
 # Build and install cross binutils (--with-sysroot)
-which abuild
-ls -l /mini-aports/main/binutils/APKBUILD
-
-CTARGET=$TARGET_ARCH BOOTSTRAP=nobase APKBUILD=$(apkbuildname binutils) abuild -rv
+CTARGET=$TARGET_ARCH BOOTSTRAP=nobase APKBUILD=$(apkbuildname binutils) abuild -r
 
 if ! CHOST=$TARGET_ARCH BOOTSTRAP=nolibc APKBUILD=$(apkbuildname musl) abuild up2date 2>/dev/null; then
 	# C-library headers for target

cross-images/toolwrapper.sh.in

@@ -11,12 +11,12 @@ toolprefix="@toolprefix@"
 
 exename="$(basename $0)"
 
-if [[ $exename != $rust_platform-* ]] ; then
-    echo >&2 "error: executable name ($exename) must start with \"$rust_platform-\""
+if [[ $exename != wrapped-* ]] ; then
+    echo >&2 "error: executable name ($exename) must start with \"wrapped-\""
     exit 1
 fi
 
-exename="${toolprefix}${exename#$rust_platform-}"
+exename="${toolprefix}${exename#wrapped-}"
 
 # working directory. We assume that directories of interest are bind-mounted
 # inside the /alpine prefix.