From 45966deb498f0f3092b1a4175192154e3710c5b4 Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Fri, 10 May 2013 20:23:25 +0900 Subject: [PATCH] fix pypy installation on x86_64 with glibc which is not strictly equal to 2.13 or 2.15. --- .../python-build/share/python-build/pypy-1.8 | 14 +++---- .../python-build/share/python-build/pypy-1.9 | 14 +++---- .../share/python-build/pypy-2.0-beta1 | 42 +++++++++---------- .../share/python-build/pypy-2.0-beta2 | 34 +++++++-------- 4 files changed, 50 insertions(+), 54 deletions(-) diff --git a/plugins/python-build/share/python-build/pypy-1.8 b/plugins/python-build/share/python-build/pypy-1.8 index 9e266208..2903b9da 100644 --- a/plugins/python-build/share/python-build/pypy-1.8 +++ b/plugins/python-build/share/python-build/pypy-1.8 @@ -1,18 +1,18 @@ -case "$OSTYPE" in -darwin*) +case "$(uname -s)" in +"Darwin" ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-osx64.tar.bz2#1c293253e8e4df411c3dd59dff82a663" ;; -linux*) - case $(uname -m) in - i386|i486|i586|i686) +"Linux" ) + case "$(uname -m)" in + "i386" | "i486" | "i586" | "i686") PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux.tar.bz2#c4a1d11e0283a390d9e9b801a4633b9f" ;; - x86_64) + "x86_64" ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux64.tar.bz2#3b81363ccbc042dfdda2fabbf419e788" ;; esac ;; -cygwin*|mingw*) +"CYGWIN"* | "MINGW"* ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-win32.zip#1af8ee722721e9f5fd06b61af530ecb3" ;; esac diff --git a/plugins/python-build/share/python-build/pypy-1.9 b/plugins/python-build/share/python-build/pypy-1.9 index 3a187298..f0bbbc43 100644 --- a/plugins/python-build/share/python-build/pypy-1.9 +++ b/plugins/python-build/share/python-build/pypy-1.9 @@ -1,18 +1,18 @@ -case "$OSTYPE" in -darwin*) +case "$(uname -s)" in +"Darwin" ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-osx64.tar.bz2#aad9c4b7b827583e37fe8ae0f7cfe0ff" ;; -linux*) - case $(uname -m) in - i386|i486|i586|i686) +"Linux" ) + case "$(uname -m)" in + "i386" | "i486" | "i586" | "i686") PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux.tar.bz2#1a08c88642434fc2e0e4256d351f48db" ;; - x86_64) + "x86_64" ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux64.tar.bz2#201d2cce2557e40c784473b471ee1b6b" ;; esac ;; -cygwin*|mingw*) +"CYGWIN"* | "MINGW"* ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-win32.zip#e7655066baed3c7bbbca7df617817dd5" ;; esac diff --git a/plugins/python-build/share/python-build/pypy-2.0-beta1 b/plugins/python-build/share/python-build/pypy-2.0-beta1 index 8b8a3a84..9299db03 100644 --- a/plugins/python-build/share/python-build/pypy-2.0-beta1 +++ b/plugins/python-build/share/python-build/pypy-2.0-beta1 @@ -1,33 +1,31 @@ -case "$OSTYPE" in -darwin*) +case "$(uname -s)" in +"Darwin" ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-osx64.tar.bz2#2802a06cd19ac86930b63afdd837c32f" ;; -linux*) - case $(uname -m) in - armel) +"Linux" ) + case "$(uname -m)" in + "armel" ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux-armel.tar.bz2#a1505520c063c591b218e5cd3436b111" ;; - i386|i486|i586|i686) + "i386" | "i486" | "i586" | "i686") PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux.tar.bz2#5aa2e4eee1c3dab86e5cec237776ced3" ;; - x86_64) - LDD_VERSION=$(ldd --version | head -1) - case "${LDD_VERSION#ldd \(*\) }" in - 2.15) - PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux64-libc2.15.tar.bz2#0fde559a7b1a3b98245d6a5ea7f8ebb2" - ;; - 2.13) - PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux64-libc2.13.tar.bz2#68d8668299cd5adf4f302eaf882c5b33" - ;; - *) - echo "pypy-2.0-beta1 requires libc version 2.13 or 2.15." 1>&2 - exit 1 - ;; - esac - ;; + "x86_64" ) + ldd_copyright="$(ldd --version | head -1)" + glibc_version="${ldd_copyright#ldd \(*\) }" + glibc_major_version="${glibc_version%%.*}" + glibc_minor_version="${glibc_version##*.}" + if [ "${glibc_major_version}" -le 2 ]; then + if [ "${glibc_minor_version}" -ge 15 ]; then + PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux64-libc2.15.tar.bz2#0fde559a7b1a3b98245d6a5ea7f8ebb2" + elif [ "${glibc_minor_version}" -ge 13 ]; then + PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux64-libc2.13.tar.bz2#68d8668299cd5adf4f302eaf882c5b33" + fi + fi + ;; esac ;; -cygwin*|mingw*) +"CYGWIN"* | "MINGW"* ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-win32.zip#e46e1c20da6a2d15e34a6ef9afca311f" ;; esac diff --git a/plugins/python-build/share/python-build/pypy-2.0-beta2 b/plugins/python-build/share/python-build/pypy-2.0-beta2 index 3734b130..5d96c911 100644 --- a/plugins/python-build/share/python-build/pypy-2.0-beta2 +++ b/plugins/python-build/share/python-build/pypy-2.0-beta2 @@ -1,27 +1,25 @@ -case "$OSTYPE" in -darwin*) +case "$(uname -s)" in +"Darwin" ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta2-osx64.tar.bz2#f7ad21f79c8005b9c00c48e190ec662e" ;; -linux*) - case $(uname -m) in - i386|i486|i586|i686) +"Linux" ) + case "$(uname -m)" in + "i386" | "i486" | "i586" | "i686") PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta2-linux.tar.bz2#61c2d5873ee62823bcf35b2e7086644f" ;; - x86_64) - LDD_VERSION=$(ldd --version | head -1) - case "${LDD_VERSION#ldd \(*\) }" in - 2.15) - PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta2-linux64-libc2.15.tar.bz2#99f062eb516d8b6b5614f2350a65adab" - ;; - *) - echo "pypy-2.0-beta2 requires libc version 2.15." 1>&2 - exit 1 - ;; - esac - ;; + "x86_64" ) + ldd_copyright="$(ldd --version | head -1)" + glibc_version="${ldd_copyright#ldd \(*\) }" + glibc_major_version="${glibc_version%%.*}" + glibc_minor_version="${glibc_version##*.}" + if [ "${glibc_major_version}" -le 2 ]; then + if [ "${glibc_minor_version}" -ge 15 ]; then + PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta2-linux64-libc2.15.tar.bz2#99f062eb516d8b6b5614f2350a65adab" + fi + fi esac ;; -cygwin*|mingw*) +"CYGWIN"* | "MINGW"* ) PYPY_URL="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta2-win32.zip#3b5250872a5e79034bb1a7c209f39391" ;; esac