From 77828654164843c6b9f904add9855211bbb69e63 Mon Sep 17 00:00:00 2001 From: pbialecki Date: Mon, 23 Jan 2023 16:42:06 -0800 Subject: [PATCH 1/2] manually invoke bash for miniconda --- common/install_conda.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/install_conda.sh b/common/install_conda.sh index 1027115c0..c7967a615 100644 --- a/common/install_conda.sh +++ b/common/install_conda.sh @@ -5,7 +5,8 @@ set -ex # Anaconda wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh chmod +x Miniconda3-latest-Linux-x86_64.sh -./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/conda +# NB: Manually invoke bash per https://github.com/conda/conda/issues/10431 +bash ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/conda rm Miniconda3-latest-Linux-x86_64.sh export PATH=/opt/conda/bin:$PATH conda install -y conda-build anaconda-client git ninja From cc0388920587952f8c2c0fef11da044e43c53ba5 Mon Sep 17 00:00:00 2001 From: pbialecki Date: Mon, 23 Jan 2023 16:51:50 -0800 Subject: [PATCH 2/2] use +x to allow for unset env var --- common/install_cpython.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/install_cpython.sh b/common/install_cpython.sh index 8ba9f7bac..644b2a885 100755 --- a/common/install_cpython.sh +++ b/common/install_cpython.sh @@ -40,7 +40,7 @@ function do_cpython_build { mkdir -p ${prefix}/lib # -Wformat added for https://bugs.python.org/issue17547 on Python 2.6 - if [[ -z ${WITH_OPENSSL} ]]; then + if [[ -z ${WITH_OPENSSL+x} ]]; then CFLAGS="-Wformat" ./configure --prefix=${prefix} --disable-shared $unicode_flags > /dev/null else CFLAGS="-Wformat" ./configure --prefix=${prefix} --with-openssl=${WITH_OPENSSL} --with-openssl-rpath=auto --disable-shared $unicode_flags > /dev/null