install setuptools user locally

Author: timfel

graalpython/lib-python/3/distutils/command/install.py

@@ -29,8 +29,8 @@
 
 INSTALL_SCHEMES = {
     'unix_prefix': {
-        'purelib': '$base/lib-python/$py_version_major/site-packages',
-        'platlib': '$platbase/lib-python/$py_version_major/site-packages',
+        'purelib': '$base/lib/python$py_version_short/site-packages',
+        'platlib': '$platbase/lib/python$py_version_short/site-packages',
         'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
@@ -291,7 +291,6 @@ def finalize_options(self):
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
                             'py_version': py_version,
-                            'py_version_major': '%d' % sys.version_info[0],
                             'py_version_short': '%d.%d' % sys.version_info[:2],
                             'py_version_nodot': '%d%d' % sys.version_info[:2],
                             'sys_prefix': prefix,

graalpython/site-packages/Makefile

@@ -23,7 +23,7 @@ default: install
 install:
 	$(QUIETLY) mx $(OPT_VERBOSE) python3 -m zipfile -e ${SETUPTOOLS_ZIP} .
 	$(QUIETLY) ${IN_SETUPTOOLS_DIR} mx $(OPT_VERBOSE) python3 bootstrap.py
-	$(QUIETLY) ${IN_SETUPTOOLS_DIR} mx $(OPT_VERBOSE) python3 setup.py $(OPT_QUIET) install
+	$(QUIETLY) ${IN_SETUPTOOLS_DIR} mx $(OPT_VERBOSE) python3 setup.py $(OPT_QUIET) install --user
 
 clean:
 	$(QUIETLY) rm -rf ${SETUPTOOLS_DIR}

mx.graalpython/suite.py

@@ -244,7 +244,6 @@
             "subDir": "graalpython",
             "native": True,
             "vpath": False,
-            "results": ["graalpython/lib-python/3/site-packages"],
             "output": ".",
             "license": ["MIT"],
             "defaultBuild": False,