From a602478ccb426d197bb3b9aac71b6a3eb71735f4 Mon Sep 17 00:00:00 2001
From: Morgan McMillian <thrrgilag@dreamfall.space>
Date: Mon, 6 Sep 2021 12:23:24 -0700
Subject: [PATCH] update pantalaimon to latest

---
 build-python.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build-python.sh b/build-python.sh
index 8c4d969..03d5dd1 100755
--- a/build-python.sh
+++ b/build-python.sh
@@ -3,13 +3,12 @@
 PYTHON_VERSION="3.7.7"
 CRYPTOGRAPHY_VERSION="3.2.1"
 
-echo "...building python..."
 cd ${BUILD_DIR}
-wget -qO- "https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz" | tar -xz
 
 echo
 echo "...building python..."
 echo
+wget -qO- "https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz" | tar -xz
 cd Python-${PYTHON_VERSION}
 ./configure --prefix="${INSTALL_DIR}" --enable-shared
 make
@@ -22,20 +21,22 @@ echo
 echo "...installing pyinstaller..."
 echo
 ${INSTALL_DIR}/bin/pip3 install --upgrade pyinstaller
+# dirty hack to work around pyinstaller locating the bootloader when building for armhf
+ln -s ${INSTALL_DIR}/lib/python3.7/site-packages/PyInstaller/bootloader/Linux-32bit-unknown ${INSTALL_DIR}/lib/python3.7/site-packages/PyInstaller/bootloader/Linux-32bit-arm
 
-export CRYPTOGRAPHY_ALLOW_OPENSSL_102="yes"
 echo
 echo "...installing cryptography..."
 echo
+export CRYPTOGRAPHY_ALLOW_OPENSSL_102="yes"
 ${INSTALL_DIR}/bin/pip3 install --upgrade cryptography==${CRYPTOGRAPHY_VERSION}
 
-export LD_LIBRARY_PATH=${ROOT}/build/${ARCH_TRIPLET}/olm/install/lib/${ARCH_TRIPLET}:${LD_LIBRARY_PATH}
-export CFLAGS=-I${ROOT}/build/${ARCH_TRIPLET}/olm/install/include
-export LDFLAGS=-L${ROOT}/build/${ARCH_TRIPLET}/olm/install/lib/${ARCH_TRIPLET}
 echo
 echo "...installing pantalaimon..."
 echo
-${INSTALL_DIR}/bin/pip3 install --upgrade pantalaimon==0.9.2
+export LD_LIBRARY_PATH=${ROOT}/build/${ARCH_TRIPLET}/olm/install/lib/${ARCH_TRIPLET}:${LD_LIBRARY_PATH}
+export CFLAGS=-I${ROOT}/build/${ARCH_TRIPLET}/olm/install/include
+export LDFLAGS=-L${ROOT}/build/${ARCH_TRIPLET}/olm/install/lib/${ARCH_TRIPLET}
+${INSTALL_DIR}/bin/pip3 install --upgrade pantalaimon
 
 export PATH=/usr/${ARCH_TRIPLET}/bin:${PATH}
 echo