macos: install setuptools and pip

For consistency with Linux, which installs modern versions of these.

Author: indygreg

cpython-macos/build-cpython.sh

@@ -42,6 +42,14 @@ cat ../Makefile.extra >> Makefile
 make -j ${NUM_CPUS}
 make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out/python
 
+pushd ${ROOT}/setuptools-${SETUPTOOLS_VERSION}
+${ROOT}/out/python/install/bin/python3 setup.py install
+popd
+
+pushd ${ROOT}/pip-${PIP_VERSION}
+${ROOT}/out/python/install/bin/python3 setup.py install
+popd
+
 # Downstream consumers don't require bytecode files. So remove them.
 # Ideally we'd adjust the build system. But meh.
 find ${ROOT}/out/python/install -type d -name __pycache__ -print0 | xargs -0 rm -rf

cpython-macos/build.py

@@ -12,6 +12,7 @@
 import subprocess
 import sys
 import tempfile
+import zipfile
 
 from pythonbuild.cpython import (
     derive_setup_local,
@@ -310,6 +311,8 @@ def process_setup_line(line):
 def build_cpython(optimized=False):
     python_archive = download_entry('cpython-3.7', BUILD)
     python_version = DOWNLOADS['cpython-3.7']['version']
+    setuptools_archive = download_entry('setuptools', BUILD)
+    pip_archive = download_entry('pip', BUILD)
 
     with (SUPPORT / 'static-modules').open('rb') as fh:
         static_modules_lines = [l.rstrip() for l in fh if not l.startswith(b'#')]
@@ -344,6 +347,10 @@ def build_cpython(optimized=False):
         extract_tar_to_directory(BUILD / 'zlib-macos.tar', deps_dir)
 
         extract_tar_to_directory(python_archive, td)
+        extract_tar_to_directory(pip_archive, td)
+
+        with zipfile.ZipFile(setuptools_archive) as zf:
+            zf.extractall(td)
 
         setup_local_path = td / ('Python-%s' % python_version) / 'Modules' / 'Setup.local'
         with setup_local_path.open('wb') as fh:
@@ -359,6 +366,8 @@ def build_cpython(optimized=False):
 
         env = dict(os.environ)
         env['PYTHON_VERSION'] = python_version
+        env['SETUPTOOLS_VERSION'] = DOWNLOADS['setuptools']['version']
+        env['PIP_VERSION'] = DOWNLOADS['pip']['version']
 
         # We force a PATH only containing system files: we don't want
         # pollution from homebrew, macports, etc.