From a304ca3b0cd4bed83c54092c052855927a4b9c9a Mon Sep 17 00:00:00 2001 From: Frankie Dintino Date: Tue, 15 Oct 2024 14:41:00 -0400 Subject: [PATCH] fixup --- wheelbuild/config.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/wheelbuild/config.sh b/wheelbuild/config.sh index 81c228c..070decf 100644 --- a/wheelbuild/config.sh +++ b/wheelbuild/config.sh @@ -10,6 +10,9 @@ CCACHE_VERSION=4.7.1 SCCACHE_VERSION=0.3.0 export PERLBREWURL=https://raw.githubusercontent.com/gugod/App-perlbrew/release-0.92/perlbrew export GITHUB_ACTIONS=1 +export PYTHON_EXE="${PYTHON_EXE:-python}" +export REPO_DIR=$(dirname $CONFIG_DIR) + # Convenience functions to run shell commands suppressed from "set -x" tracing shopt -s expand_aliases @@ -378,7 +381,7 @@ function ensure_openssl { if [ ! -n "$IS_MACOS" ]; then group_start "Install openssl" if [ -n "$IS_ALPINE" ]; then - apk add libressl-dev openssl-dev + apk add openssl-dev elif [[ $MB_ML_VER == "_2_24" ]]; then apt-get install -y libssl-dev else @@ -404,12 +407,19 @@ function ensure_sudo { function append_licenses { group_start "Append licenses" + local prefix="" + if [ -e "$REPO_DIR" ]; then + pushd $REPO_DIR + fi for filename in wheelbuild/dependency_licenses/*.txt; do echo -e "\n\n----\n\n$(basename $filename | cut -f 1 -d '.')\n" | cat >> LICENSE cat $filename >> LICENSE done echo -e "\n\n" | cat >> LICENSE cat wheelbuild/dependency_licenses/PATENTS >> LICENSE + if [ -e "$REPO_DIR" ]; then + popd + fi group_end } @@ -453,7 +463,7 @@ function pre_build { if [[ -n "$IS_MACOS" ]]; then # clear bash path cache for curl - hash -d curl + hash -d curl ||: fi if [ -e $HOME/.cargo/env ]; then