From 0fe7d78503cf52e0ca492c2699bffac0cb26103c Mon Sep 17 00:00:00 2001 From: "Yamashita, Yuu" Date: Wed, 9 Aug 2017 22:23:31 +0900 Subject: [PATCH] Check pycparser's availability when building PyPy from source --- plugins/python-build/bin/pyenv-install | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install index 6705d4bc..766e9c51 100755 --- a/plugins/python-build/bin/pyenv-install +++ b/plugins/python-build/bin/pyenv-install @@ -213,10 +213,12 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then done fi if [ -n "$PYENV_BOOTSTRAP_VERSION" ]; then - if ! PYENV_VERSION="$PYENV_BOOTSTRAP_VERSION" pyenv-exec python -c 'import curses' 1>/dev/null 2>&1; then - echo "pyenv-install: $VERSION_NAME: PyPy requires \`curses' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2 - exit 1 - fi + for dep in curses pycparser; do + if ! PYENV_VERSION="$PYENV_BOOTSTRAP_VERSION" pyenv-exec python -c "import ${dep}" 1>/dev/null 2>&1; then + echo "pyenv-install: $VERSION_NAME: PyPy requires \`${dep}' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2 + exit 1 + fi + done else echo "pyenv-install: $VERSION_NAME: PyPy requires Python 2.7 to build from source." >&2 exit 1