From adc0365923d279c721db869183964539b34737c4 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 26 Jul 2017 01:06:04 +0000
Subject: [PATCH 01/12] Add support for PyPy3 executables like `libpypy3-c.so`
 (fixes #955)

---
 plugins/python-build/bin/python-build | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index ae34bb64..4325b9e4 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -987,19 +987,20 @@ build_package_pypy() {
   mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib"
   local pypy libpypy python
   shopt -s nullglob
-  for pypy in "bin/pypy"*; do
-    case "${pypy##*/}" in
+  for bin in "bin/pypy"*; do
+    case "${bin##*/}" in
+    "libpypy"* )
+      ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" )
+      ;;
     "pypy-stm" )
       python="bin/python"
+      ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
       ;;
-    * )
+    "pypy"* )
       python="$(basename "${pypy}" | sed -e 's/pypy/python/')"
+      ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
       ;;
     esac
-    ( cd "${PREFIX_PATH}/bin" && ln -fs "${pypy##*/}" "${python##*/}" )
-  done
-  for libpypy in "bin/libpypy-c."*; do
-    ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/$(basename "${libpypy}")" "$(basename "${libpypy}")" )
   done
   shopt -u nullglob
 }
@@ -1014,11 +1015,11 @@ build_package_pypy_builder() {
     return 1
   fi
   { mkdir -p "bin" "lib"
-    if [ -x "pypy-c" ]; then
-      mv -f "pypy-c" "bin/pypy"
-    fi
-    for libpypy in "libpypy-c."*; do
-      mv -f "${libpypy}" "bin/"
+    for pypy in "pypy"*; do
+      mv -f "${pypy}" "bin/${pypy##*/}"
+    done
+    for libpypy in "libpypy"*; do
+      mv -f "${libpypy}" "bin/${libpypy##*/}"
     done
   } >&4 2>&1
   build_package_pypy

From 269a70232167774d5c3250b65486566c04d723c3 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 26 Jul 2017 01:31:17 +0000
Subject: [PATCH 02/12] Fix wrong variable reference

---
 plugins/python-build/bin/python-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 4325b9e4..9465183c 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -987,7 +987,7 @@ build_package_pypy() {
   mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib"
   local pypy libpypy python
   shopt -s nullglob
-  for bin in "bin/pypy"*; do
+  for bin in "bin/"*; do
     case "${bin##*/}" in
     "libpypy"* )
       ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" )
@@ -997,7 +997,7 @@ build_package_pypy() {
       ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
       ;;
     "pypy"* )
-      python="$(basename "${pypy}" | sed -e 's/pypy/python/')"
+      python="$(basename "${bin}" | sed -e 's/pypy/python/')"
       ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
       ;;
     esac

From 0cbfcf09d49f771e5083af00e774ce1ef9c5bb50 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 9 Aug 2017 07:34:59 +0000
Subject: [PATCH 03/12] Fix pattern match for PyPy versions

---
 plugins/python-build/bin/pyenv-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index 79c171b2..6705d4bc 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -200,7 +200,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
       done
     done
     ;;
-  "pypy-dev" | "pypy-"*"-src" | "pypy3-"*"-src" )
+  "pypy"*"-dev" | "pypy"*"-src" )
     # PyPy/PyPy3 requires existing Python 2.7 to build
     if [ -n "${PYENV_RPYTHON_VERSION}" ]; then
       PYENV_BOOTSTRAP_VERSION="${PYENV_RPYTHON_VERSION}"

From 98878e5d120260215e726d2c18914a4ffe8fe30e Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 9 Aug 2017 07:52:24 +0000
Subject: [PATCH 04/12] Changed default PyPy build option; specify `--batch` to
 avoid launching interactive debugger

---
 plugins/python-build/bin/python-build | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 9465183c..e6e77f3d 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1007,9 +1007,15 @@ build_package_pypy() {
 
 build_package_pypy_builder() {
   if [ -f "rpython/bin/rpython" ]; then # pypy 2.x
-    python "rpython/bin/rpython" ${PYPY_OPTS:-"-Ojit"} "pypy/goal/targetpypystandalone.py" >&4 2>&1
+    if [ -z "${PYPY_OPTS}" ]; then
+      local PYPY_OPTS="--opt=jit --batch --make-jobs=$(num_cpu_cores)"
+    fi
+    python "rpython/bin/rpython" ${PYPY_OPTS} "pypy/goal/targetpypystandalone.py" >&4 2>&1
   elif [ -f "pypy/translator/goal/translate.py" ]; then # pypy 1.x
-    ( cd "pypy/translator/goal" && python "translate.py" ${PYPY_OPTS:-"--opt=jit"} "targetpypystandalone.py" ) 1>&4 2>&1
+    if [ -z "${PYPY_OPTS}" ]; then
+      local PYPY_OPTS="--opt=jit"
+    fi
+    ( cd "pypy/translator/goal" && python "translate.py" ${PYPY_OPTS} "targetpypystandalone.py" ) 1>&4 2>&1
   else
     echo "not a pypy source tree" 1>&3
     return 1

From 63c00d99899971c3ed9a3ee01c69b8b3a194e171 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 9 Aug 2017 08:10:36 +0000
Subject: [PATCH 05/12] Avoid choosing virtualenv when building PyPy from
 source

---
 plugins/python-build/bin/pyenv-install | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index 6705d4bc..844b47ec 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -207,8 +207,12 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
     else
       for version in $(pyenv-versions --bare | sort -r); do
         if [[ "${version}" == "2.7"* ]]; then
-          PYENV_BOOTSTRAP_VERSION="$version"
-          break
+          if [ -f "$(pyenv-prefix "${version}")/bin/activate" ]; then
+            : # avoid choosing virtualenv since it may not have some necessary modules (e.g. cffi, pycparser)
+          else
+            PYENV_BOOTSTRAP_VERSION="$version"
+            break
+          fi
         fi
       done
     fi

From fc23323ed4543d754ec8d2e8c1a88b934fb79737 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 9 Aug 2017 22:22:05 +0900
Subject: [PATCH 06/12] Revert "Avoid choosing virtualenv when building PyPy
 from source"

This reverts commit 63c00d99899971c3ed9a3ee01c69b8b3a194e171.
---
 plugins/python-build/bin/pyenv-install | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index 844b47ec..6705d4bc 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -207,12 +207,8 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
     else
       for version in $(pyenv-versions --bare | sort -r); do
         if [[ "${version}" == "2.7"* ]]; then
-          if [ -f "$(pyenv-prefix "${version}")/bin/activate" ]; then
-            : # avoid choosing virtualenv since it may not have some necessary modules (e.g. cffi, pycparser)
-          else
-            PYENV_BOOTSTRAP_VERSION="$version"
-            break
-          fi
+          PYENV_BOOTSTRAP_VERSION="$version"
+          break
         fi
       done
     fi

From 0fe7d78503cf52e0ca492c2699bffac0cb26103c Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 9 Aug 2017 22:23:31 +0900
Subject: [PATCH 07/12] 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

From 2158e8224a6cb05956d98fade51b85f6ffa4179f Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 9 Aug 2017 22:25:06 +0900
Subject: [PATCH 08/12] Stop requiring GCC for PyPy source build

It must not have hard dependency to GCC in general.
---
 plugins/python-build/share/python-build/pypy-1.5-src           | 2 +-
 plugins/python-build/share/python-build/pypy-1.7-dev           | 2 +-
 plugins/python-build/share/python-build/pypy-1.8-dev           | 2 +-
 plugins/python-build/share/python-build/pypy-1.9-dev           | 2 +-
 plugins/python-build/share/python-build/pypy-2.0-dev           | 2 +-
 plugins/python-build/share/python-build/pypy-2.0-src           | 2 +-
 plugins/python-build/share/python-build/pypy-2.0.1-src         | 2 +-
 plugins/python-build/share/python-build/pypy-2.0.2-src         | 2 +-
 plugins/python-build/share/python-build/pypy-2.1-src           | 2 +-
 plugins/python-build/share/python-build/pypy-2.2-src           | 2 +-
 plugins/python-build/share/python-build/pypy-2.2.1-src         | 2 +-
 plugins/python-build/share/python-build/pypy-2.3-src           | 2 +-
 plugins/python-build/share/python-build/pypy-2.3.1-src         | 2 +-
 plugins/python-build/share/python-build/pypy-2.4-beta1-src     | 2 +-
 plugins/python-build/share/python-build/pypy-2.4.0-src         | 2 +-
 plugins/python-build/share/python-build/pypy-2.5.0-src         | 2 +-
 plugins/python-build/share/python-build/pypy-2.5.1-src         | 2 +-
 plugins/python-build/share/python-build/pypy-2.6.0-src         | 2 +-
 plugins/python-build/share/python-build/pypy-2.6.1-src         | 2 +-
 plugins/python-build/share/python-build/pypy-4.0.0-src         | 2 +-
 plugins/python-build/share/python-build/pypy-4.0.1-src         | 2 +-
 plugins/python-build/share/python-build/pypy-5.0.0-src         | 2 +-
 plugins/python-build/share/python-build/pypy-5.0.1-src         | 2 +-
 plugins/python-build/share/python-build/pypy-5.1-src           | 2 +-
 plugins/python-build/share/python-build/pypy-5.1.1-src         | 2 +-
 plugins/python-build/share/python-build/pypy-dev               | 2 +-
 plugins/python-build/share/python-build/pypy2-5.3-src          | 2 +-
 plugins/python-build/share/python-build/pypy2-5.3.1-src        | 2 +-
 plugins/python-build/share/python-build/pypy2-5.4-src          | 2 +-
 plugins/python-build/share/python-build/pypy2-5.4.1-src        | 2 +-
 plugins/python-build/share/python-build/pypy2-5.6.0-src        | 2 +-
 plugins/python-build/share/python-build/pypy2-5.7.0-src        | 2 +-
 plugins/python-build/share/python-build/pypy2-5.7.1-src        | 2 +-
 plugins/python-build/share/python-build/pypy2.7-5.8.0-src      | 2 +-
 plugins/python-build/share/python-build/pypy3-2.3.1-src        | 2 +-
 plugins/python-build/share/python-build/pypy3-2.4.0-src        | 2 +-
 plugins/python-build/share/python-build/pypy3-dev              | 2 +-
 plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src | 2 +-
 plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src  | 2 +-
 plugins/python-build/share/python-build/pypy3.5-5.7-beta-src   | 2 +-
 plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src | 2 +-
 plugins/python-build/share/python-build/pypy3.5-5.8.0-src      | 2 +-
 42 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/plugins/python-build/share/python-build/pypy-1.5-src b/plugins/python-build/share/python-build/pypy-1.5-src
index e06bb230..e02c147f 100644
--- a/plugins/python-build/share/python-build/pypy-1.5-src
+++ b/plugins/python-build/share/python-build/pypy-1.5-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-1.5-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-src.tar.bz2" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-1.7-dev b/plugins/python-build/share/python-build/pypy-1.7-dev
index bdfd8a2d..341579c5 100644
--- a/plugins/python-build/share/python-build/pypy-1.7-dev
+++ b/plugins/python-build/share/python-build/pypy-1.7-dev
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_hg "pypy-1.7-dev" "https://bitbucket.org/pypy/pypy" "release-1.7.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-1.8-dev b/plugins/python-build/share/python-build/pypy-1.8-dev
index e397c6f1..1822efb7 100644
--- a/plugins/python-build/share/python-build/pypy-1.8-dev
+++ b/plugins/python-build/share/python-build/pypy-1.8-dev
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_hg "pypy-1.8-dev" "https://bitbucket.org/pypy/pypy" "release-1.8.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-1.9-dev b/plugins/python-build/share/python-build/pypy-1.9-dev
index 3bae4ff0..4ebea013 100644
--- a/plugins/python-build/share/python-build/pypy-1.9-dev
+++ b/plugins/python-build/share/python-build/pypy-1.9-dev
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_hg "pypy-1.9-dev" "https://bitbucket.org/pypy/pypy" "release-1.9.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0-dev b/plugins/python-build/share/python-build/pypy-2.0-dev
index 3b11e0d6..17a2c316 100644
--- a/plugins/python-build/share/python-build/pypy-2.0-dev
+++ b/plugins/python-build/share/python-build/pypy-2.0-dev
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_hg "pypy-2.0-dev" "https://bitbucket.org/pypy/pypy" "release-2.0.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0-src b/plugins/python-build/share/python-build/pypy-2.0-src
index bd983c90..ff24a0cb 100644
--- a/plugins/python-build/share/python-build/pypy-2.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-src.tar.bz2#d92dfd418beac915d3efc28f8a2090f3c13a89ec653419deff3d7112c5c111f3" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0.1-src b/plugins/python-build/share/python-build/pypy-2.0.1-src
index 4228d85e..26a46aae 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-2.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-src.tar.bz2#d1327bc325545939236ac609ec509548a545f97b1c933dedbe42f2482a130aa0" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0.2-src b/plugins/python-build/share/python-build/pypy-2.0.2-src
index 66ee189c..9e8bf2cc 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.2-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-2.0.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2#1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.1-src b/plugins/python-build/share/python-build/pypy-2.1-src
index 2e975369..18ae3f04 100644
--- a/plugins/python-build/share/python-build/pypy-2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-src.tar.bz2#31b3066c9739b117d6bb1bdc485a919dc3b67370ec00437de1b74069943f7f17" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.2-src b/plugins/python-build/share/python-build/pypy-2.2-src
index 7f7167f9..ff2829df 100644
--- a/plugins/python-build/share/python-build/pypy-2.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.2-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-2.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-src.tar.bz2#50fffcb86039e019530a63d656580bc53c173e5f19768bddd8699cd08448e04e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.2.1-src b/plugins/python-build/share/python-build/pypy-2.2.1-src
index d7b588c3..009bb4c3 100644
--- a/plugins/python-build/share/python-build/pypy-2.2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.2.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-2.2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-src.tar.bz2#252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.3-src b/plugins/python-build/share/python-build/pypy-2.3-src
index d9d87353..11a83ce5 100644
--- a/plugins/python-build/share/python-build/pypy-2.3-src
+++ b/plugins/python-build/share/python-build/pypy-2.3-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-pypy-394146e9bb67" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-src.tar.bz2#be2c271e7f9d7c0059a551ba1501713c00336e551e7f13107f0f34c721d95b0c" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.3.1-src b/plugins/python-build/share/python-build/pypy-2.3.1-src
index af152a83..df37199d 100644
--- a/plugins/python-build/share/python-build/pypy-2.3.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.3.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-pypy-32f35069a16d" "https://bitbucket.org/pypy/pypy/get/release-2.3.1.tar.bz2#3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.4-beta1-src b/plugins/python-build/share/python-build/pypy-2.4-beta1-src
index 0593003d..b049af26 100644
--- a/plugins/python-build/share/python-build/pypy-2.4-beta1-src
+++ b/plugins/python-build/share/python-build/pypy-2.4-beta1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-pypy-9f425c60afdf" "https://bitbucket.org/pypy/pypy/get/release-2.4-beta1.tar.bz2#4baa5663872cf47e18fb35232cc70503b087e0d3f927bd4cc4bbf7ef578b13bd" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.4.0-src b/plugins/python-build/share/python-build/pypy-2.4.0-src
index 3eda15fd..060324c1 100644
--- a/plugins/python-build/share/python-build/pypy-2.4.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.4.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-pypy-c6ad44ecf5d8" "https://bitbucket.org/pypy/pypy/get/release-2.4.0.tar.bz2#7e0dec2c40106f20f002121bdabb71939915254fb91bd55b01434e4b994113d2" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.5.0-src b/plugins/python-build/share/python-build/pypy-2.5.0-src
index 01910966..15e9f717 100644
--- a/plugins/python-build/share/python-build/pypy-2.5.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.5.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-pypy-10f1b29a2bd2" "https://bitbucket.org/pypy/pypy/get/release-2.5.0.tar.bz2#8d644a55a3150cf3d18536c784e3410bb3f3438c1505000c4f761863bacedf88" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.5.1-src b/plugins/python-build/share/python-build/pypy-2.5.1-src
index 4d5830f7..32430c63 100644
--- a/plugins/python-build/share/python-build/pypy-2.5.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.5.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-2.5.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.1-src.tar.bz2#ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.6.0-src b/plugins/python-build/share/python-build/pypy-2.6.0-src
index 66a84eea..3147973c 100644
--- a/plugins/python-build/share/python-build/pypy-2.6.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.6.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-2.6.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-src.tar.bz2#9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.6.1-src b/plugins/python-build/share/python-build/pypy-2.6.1-src
index 06a5d67b..2fa2c807 100644
--- a/plugins/python-build/share/python-build/pypy-2.6.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.6.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-2.6.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.1-src.tar.bz2#7fddd414c9348c2f899f79ad86adc3fc2b19443855b5243f58487e1f0ac46560" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-4.0.0-src b/plugins/python-build/share/python-build/pypy-4.0.0-src
index 2e4d7997..6ca02b79 100644
--- a/plugins/python-build/share/python-build/pypy-4.0.0-src
+++ b/plugins/python-build/share/python-build/pypy-4.0.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-4.0.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.0-src.tar.bz2#acff480e44ce92acd057f2e786775af36dc3c2cd12e9efc60a1ac6a562ad7b4d" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-4.0.1-src b/plugins/python-build/share/python-build/pypy-4.0.1-src
index d372a388..ad0a1aec 100644
--- a/plugins/python-build/share/python-build/pypy-4.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-4.0.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-4.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-src.tar.bz2#29f5aa6ba17b34fd980e85172dfeb4086fdc373ad392b1feff2677d2d8aea23c" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.0.0-src b/plugins/python-build/share/python-build/pypy-5.0.0-src
index 186f32f5..4515204f 100644
--- a/plugins/python-build/share/python-build/pypy-5.0.0-src
+++ b/plugins/python-build/share/python-build/pypy-5.0.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-5.0.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-src.tar.bz2#89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.0.1-src b/plugins/python-build/share/python-build/pypy-5.0.1-src
index 402757fc..2b0161e4 100644
--- a/plugins/python-build/share/python-build/pypy-5.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-5.0.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-5.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.1-src.tar.bz2#1573c9284d3ec236c8e6ef3b954753932dff29462c54b5885b761d1ee68b6e05" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.1-src b/plugins/python-build/share/python-build/pypy-5.1-src
index b51d0089..e15959bb 100644
--- a/plugins/python-build/share/python-build/pypy-5.1-src
+++ b/plugins/python-build/share/python-build/pypy-5.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-5.1.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.1.0-src.tar.bz2#16bab9501e942c0704abbf9cd6c4e950c6a76dc226cf1e447ea084916aef4714" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.1.1-src b/plugins/python-build/share/python-build/pypy-5.1.1-src
index 7fbdb9db..12a08297 100644
--- a/plugins/python-build/share/python-build/pypy-5.1.1-src
+++ b/plugins/python-build/share/python-build/pypy-5.1.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy-5.1.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.1.1-src.tar.bz2#ca3d943d7fbd78bb957ee9e5833ada4bb8506ac99a41b7628790e286a65ed2be" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-dev b/plugins/python-build/share/python-build/pypy-dev
index a9982a99..2aaeced7 100644
--- a/plugins/python-build/share/python-build/pypy-dev
+++ b/plugins/python-build/share/python-build/pypy-dev
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_hg "pypy-dev" "https://bitbucket.org/pypy/pypy" "default" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.3-src b/plugins/python-build/share/python-build/pypy2-5.3-src
index 89855977..4dcbddcb 100644
--- a/plugins/python-build/share/python-build/pypy2-5.3-src
+++ b/plugins/python-build/share/python-build/pypy2-5.3-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy2-v5.3.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.3.0-src.tar.bz2#4142eb8f403810bc88a4911792bb5a502e152df95806e33e69050c828cd160d5" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.3.1-src b/plugins/python-build/share/python-build/pypy2-5.3.1-src
index 3a605063..fdeabc4e 100644
--- a/plugins/python-build/share/python-build/pypy2-5.3.1-src
+++ b/plugins/python-build/share/python-build/pypy2-5.3.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy2-v5.3.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.3.1-src.tar.bz2#31a52bab584abf3a0f0defd1bf9a29131dab08df43885e7eeddfc7dc9b71836e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.4-src b/plugins/python-build/share/python-build/pypy2-5.4-src
index dd231434..75196c21 100644
--- a/plugins/python-build/share/python-build/pypy2-5.4-src
+++ b/plugins/python-build/share/python-build/pypy2-5.4-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy2-v5.4.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.4.0-src.tar.bz2#d9568ebe9a14d0eaefde887d78f3cba63d665e95c0d234bb583932341f55a655" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.4.1-src b/plugins/python-build/share/python-build/pypy2-5.4.1-src
index 891a7a0e..3e864137 100644
--- a/plugins/python-build/share/python-build/pypy2-5.4.1-src
+++ b/plugins/python-build/share/python-build/pypy2-5.4.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy2-v5.4.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.4.1-src.tar.bz2#45dbc50c81498f6f1067201b8fc887074b43b84ee32cc47f15e7db17571e9352" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.6.0-src b/plugins/python-build/share/python-build/pypy2-5.6.0-src
index 95b933c9..75a099d1 100644
--- a/plugins/python-build/share/python-build/pypy2-5.6.0-src
+++ b/plugins/python-build/share/python-build/pypy2-5.6.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy2-v5.6.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-src.tar.bz2#7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.7.0-src b/plugins/python-build/share/python-build/pypy2-5.7.0-src
index 1cf5059e..e2d9be6d 100644
--- a/plugins/python-build/share/python-build/pypy2-5.7.0-src
+++ b/plugins/python-build/share/python-build/pypy2-5.7.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy2-v5.7.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2#e522ea7ca51b16ee5505f22b86803664b762a263a6d69ba84c359fcf8365ad3e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.7.1-src b/plugins/python-build/share/python-build/pypy2-5.7.1-src
index 1cf5059e..e2d9be6d 100644
--- a/plugins/python-build/share/python-build/pypy2-5.7.1-src
+++ b/plugins/python-build/share/python-build/pypy2-5.7.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy2-v5.7.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2#e522ea7ca51b16ee5505f22b86803664b762a263a6d69ba84c359fcf8365ad3e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2.7-5.8.0-src b/plugins/python-build/share/python-build/pypy2.7-5.8.0-src
index 047c78b2..92d316e3 100644
--- a/plugins/python-build/share/python-build/pypy2.7-5.8.0-src
+++ b/plugins/python-build/share/python-build/pypy2.7-5.8.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy2-v5.8.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-src.tar.bz2#504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3-2.3.1-src b/plugins/python-build/share/python-build/pypy3-2.3.1-src
index b150fa5c..a764bf19 100644
--- a/plugins/python-build/share/python-build/pypy3-2.3.1-src
+++ b/plugins/python-build/share/python-build/pypy3-2.3.1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy3-2.3.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.3.1-src.tar.bz2#924ca36bf85e02469c71d451c145f9a6d19b905df473a3d1c25179c63ea79d74" "pypy_builder" verify_py32 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3-2.4.0-src b/plugins/python-build/share/python-build/pypy3-2.4.0-src
index 28b1b46c..12287f59 100644
--- a/plugins/python-build/share/python-build/pypy3-2.4.0-src
+++ b/plugins/python-build/share/python-build/pypy3-2.4.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy3-2.4.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-src.tar.bz2#d9ba207d6eecf8a0dc4414e9f4e92db1abd143e8cc6ec4a6bdcac75b29f104f3" "pypy_builder" verify_py32 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3-dev b/plugins/python-build/share/python-build/pypy3-dev
index 839a2e22..7191ae15 100644
--- a/plugins/python-build/share/python-build/pypy3-dev
+++ b/plugins/python-build/share/python-build/pypy3-dev
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_hg "pypy3-dev" "https://bitbucket.org/pypy/pypy" "py3k" "pypy_builder" verify_py32 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src b/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src
index 6cbe1bc8..9c151d15 100644
--- a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src
+++ b/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy3.3-v5.2.0-alpha1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.2.0-alpha1-src.tar.bz2#344c2f088c82ea1274964bb0505ab80d3f9e538cc03f91aa109325ddbaa61426" "pypy_builder" verify_py33 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
index 6f792106..e69387e7 100644
--- a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
+++ b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy3-v5.5.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-src.tar.bz2#d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f" "pypy_builder" verify_py33 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src b/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src
index 129535c1..5ef76150 100644
--- a/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy3-v5.7.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-src.tar.bz2#f0f563b74f8b82ec33b022393219b93cc0d81e9f9500614fe8417b67a52e9569" "pypy_builder" verify_py35 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src b/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src
index 3f4fcb5c..1c1ea48f 100644
--- a/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy3-v5.7.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.tar.bz2#40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0" "pypy_builder" verify_py35 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.5-5.8.0-src b/plugins/python-build/share/python-build/pypy3.5-5.8.0-src
index b9e0e97f..51320c96 100644
--- a/plugins/python-build/share/python-build/pypy3.5-5.8.0-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.8.0-src
@@ -1,2 +1,2 @@
-require_gcc
+#require_gcc
 install_package "pypy3-v5.8.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.8.0-src.tar.bz2#9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223" "pypy_builder" verify_py35 ensurepip

From bb352f8822103fd4c30637e746c772414d715e20 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Sun, 13 Aug 2017 16:53:41 +0900
Subject: [PATCH 09/12] Add `genc` as a dependency

---
 plugins/python-build/bin/pyenv-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index 766e9c51..f9ee37ec 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -213,7 +213,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
       done
     fi
     if [ -n "$PYENV_BOOTSTRAP_VERSION" ]; then
-      for dep in curses pycparser; do
+      for dep in curses genc 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

From 41f00c639d254e5ef9adcb57e6ff8576934efd3b Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Sun, 13 Aug 2017 16:54:04 +0900
Subject: [PATCH 10/12] Check if copying file is a file or not

---
 plugins/python-build/bin/python-build | 36 ++++++++++++++++-----------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index e6e77f3d..814ae57f 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -988,19 +988,21 @@ build_package_pypy() {
   local pypy libpypy python
   shopt -s nullglob
   for bin in "bin/"*; do
-    case "${bin##*/}" in
-    "libpypy"* )
-      ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" )
-      ;;
-    "pypy-stm" )
-      python="bin/python"
-      ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
-      ;;
-    "pypy"* )
-      python="$(basename "${bin}" | sed -e 's/pypy/python/')"
-      ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
-      ;;
-    esac
+    if [ -f "${bin}" ]; then
+      case "${bin##*/}" in
+      "libpypy"* )
+        ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" )
+        ;;
+      "pypy-stm" )
+        python="bin/python"
+        ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
+        ;;
+      "pypy"* )
+        python="$(basename "${bin}" | sed -e 's/pypy/python/')"
+        ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
+        ;;
+      esac
+    fi
   done
   shopt -u nullglob
 }
@@ -1022,10 +1024,14 @@ build_package_pypy_builder() {
   fi
   { mkdir -p "bin" "lib"
     for pypy in "pypy"*; do
-      mv -f "${pypy}" "bin/${pypy##*/}"
+      if [ -f "${pypy}" ]; then
+        mv -f "${pypy}" "bin/${pypy##*/}"
+      fi
     done
     for libpypy in "libpypy"*; do
-      mv -f "${libpypy}" "bin/${libpypy##*/}"
+      if [ -f "${libpypy}" ]; then
+        mv -f "${libpypy}" "bin/${libpypy##*/}"
+      fi
     done
   } >&4 2>&1
   build_package_pypy

From 8b0ec441da80aa2bfe54d22bc150d27313aec096 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Sun, 13 Aug 2017 17:31:39 +0900
Subject: [PATCH 11/12] Add OpenSSL to pypy build definitions

---
 plugins/python-build/share/python-build/pypy-1.5-src           | 1 +
 plugins/python-build/share/python-build/pypy-1.7-dev           | 1 +
 plugins/python-build/share/python-build/pypy-1.8-dev           | 1 +
 plugins/python-build/share/python-build/pypy-1.9-dev           | 1 +
 plugins/python-build/share/python-build/pypy-2.0-dev           | 1 +
 plugins/python-build/share/python-build/pypy-2.0-src           | 1 +
 plugins/python-build/share/python-build/pypy-2.0.1-src         | 1 +
 plugins/python-build/share/python-build/pypy-2.0.2-src         | 1 +
 plugins/python-build/share/python-build/pypy-2.1-src           | 1 +
 plugins/python-build/share/python-build/pypy-2.2-src           | 1 +
 plugins/python-build/share/python-build/pypy-2.2.1-src         | 1 +
 plugins/python-build/share/python-build/pypy-2.3-src           | 1 +
 plugins/python-build/share/python-build/pypy-2.3.1-src         | 1 +
 plugins/python-build/share/python-build/pypy-2.4-beta1-src     | 1 +
 plugins/python-build/share/python-build/pypy-2.4.0-src         | 1 +
 plugins/python-build/share/python-build/pypy-2.5.0-src         | 1 +
 plugins/python-build/share/python-build/pypy-2.5.1-src         | 1 +
 plugins/python-build/share/python-build/pypy-2.6.0-src         | 1 +
 plugins/python-build/share/python-build/pypy-2.6.1-src         | 1 +
 plugins/python-build/share/python-build/pypy-4.0.0-src         | 1 +
 plugins/python-build/share/python-build/pypy-4.0.1-src         | 1 +
 plugins/python-build/share/python-build/pypy-5.0.0-src         | 1 +
 plugins/python-build/share/python-build/pypy-5.0.1-src         | 1 +
 plugins/python-build/share/python-build/pypy-5.1-src           | 1 +
 plugins/python-build/share/python-build/pypy-5.1.1-src         | 1 +
 plugins/python-build/share/python-build/pypy-dev               | 1 +
 plugins/python-build/share/python-build/pypy2-5.3-src          | 1 +
 plugins/python-build/share/python-build/pypy2-5.3.1-src        | 1 +
 plugins/python-build/share/python-build/pypy2-5.4-src          | 1 +
 plugins/python-build/share/python-build/pypy2-5.4.1-src        | 1 +
 plugins/python-build/share/python-build/pypy2-5.6.0-src        | 1 +
 plugins/python-build/share/python-build/pypy2-5.7.0-src        | 1 +
 plugins/python-build/share/python-build/pypy2-5.7.1-src        | 1 +
 plugins/python-build/share/python-build/pypy2.7-5.8.0-src      | 1 +
 plugins/python-build/share/python-build/pypy3-2.3.1-src        | 1 +
 plugins/python-build/share/python-build/pypy3-2.4.0-src        | 1 +
 plugins/python-build/share/python-build/pypy3-dev              | 1 +
 plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src | 1 +
 plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src  | 1 +
 plugins/python-build/share/python-build/pypy3.5-5.7-beta-src   | 1 +
 plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src | 1 +
 plugins/python-build/share/python-build/pypy3.5-5.8.0-src      | 1 +
 42 files changed, 42 insertions(+)

diff --git a/plugins/python-build/share/python-build/pypy-1.5-src b/plugins/python-build/share/python-build/pypy-1.5-src
index e02c147f..75808a4d 100644
--- a/plugins/python-build/share/python-build/pypy-1.5-src
+++ b/plugins/python-build/share/python-build/pypy-1.5-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-1.5-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-src.tar.bz2" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-1.7-dev b/plugins/python-build/share/python-build/pypy-1.7-dev
index 341579c5..0a09458e 100644
--- a/plugins/python-build/share/python-build/pypy-1.7-dev
+++ b/plugins/python-build/share/python-build/pypy-1.7-dev
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-1.7-dev" "https://bitbucket.org/pypy/pypy" "release-1.7.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-1.8-dev b/plugins/python-build/share/python-build/pypy-1.8-dev
index 1822efb7..c25cf248 100644
--- a/plugins/python-build/share/python-build/pypy-1.8-dev
+++ b/plugins/python-build/share/python-build/pypy-1.8-dev
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-1.8-dev" "https://bitbucket.org/pypy/pypy" "release-1.8.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-1.9-dev b/plugins/python-build/share/python-build/pypy-1.9-dev
index 4ebea013..505dbcdb 100644
--- a/plugins/python-build/share/python-build/pypy-1.9-dev
+++ b/plugins/python-build/share/python-build/pypy-1.9-dev
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-1.9-dev" "https://bitbucket.org/pypy/pypy" "release-1.9.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0-dev b/plugins/python-build/share/python-build/pypy-2.0-dev
index 17a2c316..e8c9a6f4 100644
--- a/plugins/python-build/share/python-build/pypy-2.0-dev
+++ b/plugins/python-build/share/python-build/pypy-2.0-dev
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-2.0-dev" "https://bitbucket.org/pypy/pypy" "release-2.0.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0-src b/plugins/python-build/share/python-build/pypy-2.0-src
index ff24a0cb..4a561c29 100644
--- a/plugins/python-build/share/python-build/pypy-2.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-src.tar.bz2#d92dfd418beac915d3efc28f8a2090f3c13a89ec653419deff3d7112c5c111f3" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0.1-src b/plugins/python-build/share/python-build/pypy-2.0.1-src
index 26a46aae..3204cc3a 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-src.tar.bz2#d1327bc325545939236ac609ec509548a545f97b1c933dedbe42f2482a130aa0" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0.2-src b/plugins/python-build/share/python-build/pypy-2.0.2-src
index 9e8bf2cc..d5e38403 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.2-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.0.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2#1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.1-src b/plugins/python-build/share/python-build/pypy-2.1-src
index 18ae3f04..b3035b09 100644
--- a/plugins/python-build/share/python-build/pypy-2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-src.tar.bz2#31b3066c9739b117d6bb1bdc485a919dc3b67370ec00437de1b74069943f7f17" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.2-src b/plugins/python-build/share/python-build/pypy-2.2-src
index ff2829df..e59e8714 100644
--- a/plugins/python-build/share/python-build/pypy-2.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.2-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-src.tar.bz2#50fffcb86039e019530a63d656580bc53c173e5f19768bddd8699cd08448e04e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.2.1-src b/plugins/python-build/share/python-build/pypy-2.2.1-src
index 009bb4c3..82e7b73b 100644
--- a/plugins/python-build/share/python-build/pypy-2.2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.2.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-src.tar.bz2#252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.3-src b/plugins/python-build/share/python-build/pypy-2.3-src
index 11a83ce5..b749cf7b 100644
--- a/plugins/python-build/share/python-build/pypy-2.3-src
+++ b/plugins/python-build/share/python-build/pypy-2.3-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-394146e9bb67" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-src.tar.bz2#be2c271e7f9d7c0059a551ba1501713c00336e551e7f13107f0f34c721d95b0c" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.3.1-src b/plugins/python-build/share/python-build/pypy-2.3.1-src
index df37199d..4960278b 100644
--- a/plugins/python-build/share/python-build/pypy-2.3.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.3.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-32f35069a16d" "https://bitbucket.org/pypy/pypy/get/release-2.3.1.tar.bz2#3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.4-beta1-src b/plugins/python-build/share/python-build/pypy-2.4-beta1-src
index b049af26..e44eae23 100644
--- a/plugins/python-build/share/python-build/pypy-2.4-beta1-src
+++ b/plugins/python-build/share/python-build/pypy-2.4-beta1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-9f425c60afdf" "https://bitbucket.org/pypy/pypy/get/release-2.4-beta1.tar.bz2#4baa5663872cf47e18fb35232cc70503b087e0d3f927bd4cc4bbf7ef578b13bd" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.4.0-src b/plugins/python-build/share/python-build/pypy-2.4.0-src
index 060324c1..4a3eea1c 100644
--- a/plugins/python-build/share/python-build/pypy-2.4.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.4.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-c6ad44ecf5d8" "https://bitbucket.org/pypy/pypy/get/release-2.4.0.tar.bz2#7e0dec2c40106f20f002121bdabb71939915254fb91bd55b01434e4b994113d2" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.5.0-src b/plugins/python-build/share/python-build/pypy-2.5.0-src
index 15e9f717..cc364a1a 100644
--- a/plugins/python-build/share/python-build/pypy-2.5.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.5.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-10f1b29a2bd2" "https://bitbucket.org/pypy/pypy/get/release-2.5.0.tar.bz2#8d644a55a3150cf3d18536c784e3410bb3f3438c1505000c4f761863bacedf88" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.5.1-src b/plugins/python-build/share/python-build/pypy-2.5.1-src
index 32430c63..2aad4c7b 100644
--- a/plugins/python-build/share/python-build/pypy-2.5.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.5.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.5.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.1-src.tar.bz2#ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.6.0-src b/plugins/python-build/share/python-build/pypy-2.6.0-src
index 3147973c..794f16bf 100644
--- a/plugins/python-build/share/python-build/pypy-2.6.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.6.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.6.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-src.tar.bz2#9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.6.1-src b/plugins/python-build/share/python-build/pypy-2.6.1-src
index 2fa2c807..f41ed07d 100644
--- a/plugins/python-build/share/python-build/pypy-2.6.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.6.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.6.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.1-src.tar.bz2#7fddd414c9348c2f899f79ad86adc3fc2b19443855b5243f58487e1f0ac46560" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-4.0.0-src b/plugins/python-build/share/python-build/pypy-4.0.0-src
index 6ca02b79..758f3074 100644
--- a/plugins/python-build/share/python-build/pypy-4.0.0-src
+++ b/plugins/python-build/share/python-build/pypy-4.0.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-4.0.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.0-src.tar.bz2#acff480e44ce92acd057f2e786775af36dc3c2cd12e9efc60a1ac6a562ad7b4d" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-4.0.1-src b/plugins/python-build/share/python-build/pypy-4.0.1-src
index ad0a1aec..e53bd2b9 100644
--- a/plugins/python-build/share/python-build/pypy-4.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-4.0.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-4.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-src.tar.bz2#29f5aa6ba17b34fd980e85172dfeb4086fdc373ad392b1feff2677d2d8aea23c" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.0.0-src b/plugins/python-build/share/python-build/pypy-5.0.0-src
index 4515204f..559981e2 100644
--- a/plugins/python-build/share/python-build/pypy-5.0.0-src
+++ b/plugins/python-build/share/python-build/pypy-5.0.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-5.0.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-src.tar.bz2#89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.0.1-src b/plugins/python-build/share/python-build/pypy-5.0.1-src
index 2b0161e4..efad8edc 100644
--- a/plugins/python-build/share/python-build/pypy-5.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-5.0.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-5.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.1-src.tar.bz2#1573c9284d3ec236c8e6ef3b954753932dff29462c54b5885b761d1ee68b6e05" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.1-src b/plugins/python-build/share/python-build/pypy-5.1-src
index e15959bb..c9b50e3f 100644
--- a/plugins/python-build/share/python-build/pypy-5.1-src
+++ b/plugins/python-build/share/python-build/pypy-5.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-5.1.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.1.0-src.tar.bz2#16bab9501e942c0704abbf9cd6c4e950c6a76dc226cf1e447ea084916aef4714" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.1.1-src b/plugins/python-build/share/python-build/pypy-5.1.1-src
index 12a08297..86450258 100644
--- a/plugins/python-build/share/python-build/pypy-5.1.1-src
+++ b/plugins/python-build/share/python-build/pypy-5.1.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-5.1.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.1.1-src.tar.bz2#ca3d943d7fbd78bb957ee9e5833ada4bb8506ac99a41b7628790e286a65ed2be" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-dev b/plugins/python-build/share/python-build/pypy-dev
index 2aaeced7..4642e12a 100644
--- a/plugins/python-build/share/python-build/pypy-dev
+++ b/plugins/python-build/share/python-build/pypy-dev
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-dev" "https://bitbucket.org/pypy/pypy" "default" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.3-src b/plugins/python-build/share/python-build/pypy2-5.3-src
index 4dcbddcb..e8334fa0 100644
--- a/plugins/python-build/share/python-build/pypy2-5.3-src
+++ b/plugins/python-build/share/python-build/pypy2-5.3-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.3.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.3.0-src.tar.bz2#4142eb8f403810bc88a4911792bb5a502e152df95806e33e69050c828cd160d5" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.3.1-src b/plugins/python-build/share/python-build/pypy2-5.3.1-src
index fdeabc4e..1bb4b1c4 100644
--- a/plugins/python-build/share/python-build/pypy2-5.3.1-src
+++ b/plugins/python-build/share/python-build/pypy2-5.3.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.3.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.3.1-src.tar.bz2#31a52bab584abf3a0f0defd1bf9a29131dab08df43885e7eeddfc7dc9b71836e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.4-src b/plugins/python-build/share/python-build/pypy2-5.4-src
index 75196c21..53a35a0e 100644
--- a/plugins/python-build/share/python-build/pypy2-5.4-src
+++ b/plugins/python-build/share/python-build/pypy2-5.4-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.4.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.4.0-src.tar.bz2#d9568ebe9a14d0eaefde887d78f3cba63d665e95c0d234bb583932341f55a655" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.4.1-src b/plugins/python-build/share/python-build/pypy2-5.4.1-src
index 3e864137..11ec0613 100644
--- a/plugins/python-build/share/python-build/pypy2-5.4.1-src
+++ b/plugins/python-build/share/python-build/pypy2-5.4.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.4.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.4.1-src.tar.bz2#45dbc50c81498f6f1067201b8fc887074b43b84ee32cc47f15e7db17571e9352" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.6.0-src b/plugins/python-build/share/python-build/pypy2-5.6.0-src
index 75a099d1..b399db03 100644
--- a/plugins/python-build/share/python-build/pypy2-5.6.0-src
+++ b/plugins/python-build/share/python-build/pypy2-5.6.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.6.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-src.tar.bz2#7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.7.0-src b/plugins/python-build/share/python-build/pypy2-5.7.0-src
index e2d9be6d..f635cfc2 100644
--- a/plugins/python-build/share/python-build/pypy2-5.7.0-src
+++ b/plugins/python-build/share/python-build/pypy2-5.7.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.7.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2#e522ea7ca51b16ee5505f22b86803664b762a263a6d69ba84c359fcf8365ad3e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.7.1-src b/plugins/python-build/share/python-build/pypy2-5.7.1-src
index e2d9be6d..f635cfc2 100644
--- a/plugins/python-build/share/python-build/pypy2-5.7.1-src
+++ b/plugins/python-build/share/python-build/pypy2-5.7.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.7.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2#e522ea7ca51b16ee5505f22b86803664b762a263a6d69ba84c359fcf8365ad3e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2.7-5.8.0-src b/plugins/python-build/share/python-build/pypy2.7-5.8.0-src
index 92d316e3..eb281790 100644
--- a/plugins/python-build/share/python-build/pypy2.7-5.8.0-src
+++ b/plugins/python-build/share/python-build/pypy2.7-5.8.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.8.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-src.tar.bz2#504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3-2.3.1-src b/plugins/python-build/share/python-build/pypy3-2.3.1-src
index a764bf19..288ebc74 100644
--- a/plugins/python-build/share/python-build/pypy3-2.3.1-src
+++ b/plugins/python-build/share/python-build/pypy3-2.3.1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-2.3.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.3.1-src.tar.bz2#924ca36bf85e02469c71d451c145f9a6d19b905df473a3d1c25179c63ea79d74" "pypy_builder" verify_py32 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3-2.4.0-src b/plugins/python-build/share/python-build/pypy3-2.4.0-src
index 12287f59..4fae677f 100644
--- a/plugins/python-build/share/python-build/pypy3-2.4.0-src
+++ b/plugins/python-build/share/python-build/pypy3-2.4.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-2.4.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-src.tar.bz2#d9ba207d6eecf8a0dc4414e9f4e92db1abd143e8cc6ec4a6bdcac75b29f104f3" "pypy_builder" verify_py32 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3-dev b/plugins/python-build/share/python-build/pypy3-dev
index 7191ae15..004f66a7 100644
--- a/plugins/python-build/share/python-build/pypy3-dev
+++ b/plugins/python-build/share/python-build/pypy3-dev
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy3-dev" "https://bitbucket.org/pypy/pypy" "py3k" "pypy_builder" verify_py32 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src b/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src
index 9c151d15..6ada1e8f 100644
--- a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src
+++ b/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3.3-v5.2.0-alpha1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.2.0-alpha1-src.tar.bz2#344c2f088c82ea1274964bb0505ab80d3f9e538cc03f91aa109325ddbaa61426" "pypy_builder" verify_py33 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
index e69387e7..711d59f0 100644
--- a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
+++ b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-v5.5.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-src.tar.bz2#d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f" "pypy_builder" verify_py33 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src b/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src
index 5ef76150..50ed4354 100644
--- a/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-v5.7.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-src.tar.bz2#f0f563b74f8b82ec33b022393219b93cc0d81e9f9500614fe8417b67a52e9569" "pypy_builder" verify_py35 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src b/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src
index 1c1ea48f..a894ff48 100644
--- a/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-v5.7.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.tar.bz2#40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0" "pypy_builder" verify_py35 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.5-5.8.0-src b/plugins/python-build/share/python-build/pypy3.5-5.8.0-src
index 51320c96..b6b2e7e2 100644
--- a/plugins/python-build/share/python-build/pypy3.5-5.8.0-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.8.0-src
@@ -1,2 +1,3 @@
 #require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-v5.8.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.8.0-src.tar.bz2#9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223" "pypy_builder" verify_py35 ensurepip

From b1d32217c3f5ccdc215e8f0ed42a7e5c4ebf493e Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Sun, 13 Aug 2017 20:01:29 +0900
Subject: [PATCH 12/12] Avoid creating a symlink for symlink

---
 plugins/python-build/bin/python-build | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 814ae57f..1037006d 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -985,21 +985,16 @@ pyston_architecture() {
 build_package_pypy() {
   build_package_copy
   mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib"
-  local pypy libpypy python
+  local bin
   shopt -s nullglob
   for bin in "bin/"*; do
-    if [ -f "${bin}" ]; then
+    if [ -f "${bin}" ] && [ -x "${bin}" ] && [ ! -L "${bin}" ]; then
       case "${bin##*/}" in
       "libpypy"* )
         ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" )
         ;;
-      "pypy-stm" )
-        python="bin/python"
-        ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
-        ;;
       "pypy"* )
-        python="$(basename "${bin}" | sed -e 's/pypy/python/')"
-        ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
+        ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "python" )
         ;;
       esac
     fi
@@ -1023,13 +1018,15 @@ build_package_pypy_builder() {
     return 1
   fi
   { mkdir -p "bin" "lib"
+    local pypy
     for pypy in "pypy"*; do
-      if [ -f "${pypy}" ]; then
+      if [ -f "${pypy}" ] && [ -x "${pypy}" ] && [ ! -L "${pypy}" ]; then
         mv -f "${pypy}" "bin/${pypy##*/}"
       fi
     done
+    local libpypy
     for libpypy in "libpypy"*; do
-      if [ -f "${libpypy}" ]; then
+      if [ -f "${libpypy}" ] && [ -x "${libpypy}" ] && [ ! -L "${libpypy}" ]; then
         mv -f "${libpypy}" "bin/${libpypy##*/}"
       fi
     done