From abec629bf79116c6abe4c4c5233aba661e80f722 Mon Sep 17 00:00:00 2001
From: Laszlo Kiss-Kollar <kiss.kollar.laszlo@gmail.com>
Date: Thu, 15 Jul 2021 22:57:11 +0100
Subject: [PATCH] fixup! fixup! fixup! wip: Add musllinux_1_1

---
 docker/Dockerfile                | 7 +------
 docker/build_scripts/finalize.sh | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4daf220c..9c960a3d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,12 +19,7 @@ ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8
 ENV DEVTOOLSET_ROOTPATH=${DEVTOOLSET_ROOTPATH}
 ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH_ARG}
 ENV PATH=${PREPEND_PATH}${PATH}
-# FIXME
-# ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-ENV ACLOCAL_PATH=/usr/share/aclocal/
-
-# FIXME make this a script
-RUN if [ "$POLICY" == "musllinux_1_1" ]; then apk add --no-cache bash; fi
+ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
 
 # first copy the fixup mirrors script, keep the script around
 COPY build_scripts/fixup-mirrors.sh /usr/local/sbin/fixup-mirrors
diff --git a/docker/build_scripts/finalize.sh b/docker/build_scripts/finalize.sh
index ab433308..fa7cfc3a 100755
--- a/docker/build_scripts/finalize.sh
+++ b/docker/build_scripts/finalize.sh
@@ -48,14 +48,14 @@ pip install -U --require-hashes -r $MY_DIR/requirements3.9.txt
 if [ "${POLICY}" == "musllinux_1_1" ]; then
     # On Alpine cmake needs cmake to build. Install it from apk to
     # build a newer version.
-    apk add --no-cache --virtual .cmake cmake
+    apk add --no-cache --virtual .cmake-deps cmake openssl-dev
 fi
 
 pip install -U --require-hashes -r $MY_DIR/requirements-tools.txt
 
 if [ "${POLICY}" == "musllinux_1_1" ]; then
     # Remove the apk version
-    apk del .cmake
+    apk del .cmake-deps
 fi
 
 # Make auditwheel available in PATH