From 56e7ab6aa82f77ba812931d47fdb7d26cd6f412c Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sat, 4 Feb 2017 18:07:38 +1100 Subject: [PATCH] setuptools and dependencies, don't hard code python version --- appdirs/Pkgfile | 6 ++++-- packaging/Pkgfile | 6 ++++-- pip/Pkgfile | 6 ++++-- pyparsing/Pkgfile | 6 ++++-- setuptools/Pkgfile | 10 +++++++--- six/Pkgfile | 6 ++++-- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/appdirs/Pkgfile b/appdirs/Pkgfile index c3c79a7b2..f35fafba9 100644 --- a/appdirs/Pkgfile +++ b/appdirs/Pkgfile @@ -16,10 +16,12 @@ build() { install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py install \ --prefix=/usr --root=$PKG --optimize=1 else diff --git a/packaging/Pkgfile b/packaging/Pkgfile index b339b0f2e..2cba09264 100644 --- a/packaging/Pkgfile +++ b/packaging/Pkgfile @@ -16,10 +16,12 @@ build() { install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py install \ --prefix=/usr --root=$PKG --optimize=1 else diff --git a/pip/Pkgfile b/pip/Pkgfile index 30b257538..ed4c8e198 100644 --- a/pip/Pkgfile +++ b/pip/Pkgfile @@ -16,10 +16,12 @@ build() { install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py install \ --prefix=/usr --root=$PKG --optimize=1 else diff --git a/pyparsing/Pkgfile b/pyparsing/Pkgfile index 998c66050..5b4e66190 100644 --- a/pyparsing/Pkgfile +++ b/pyparsing/Pkgfile @@ -16,10 +16,12 @@ build() { install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py install \ --prefix=/usr --root=$PKG --optimize=1 else diff --git a/setuptools/Pkgfile b/setuptools/Pkgfile index 67bc26a09..5a998efce 100644 --- a/setuptools/Pkgfile +++ b/setuptools/Pkgfile @@ -19,13 +19,15 @@ build() { install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python bootstrap.py - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py install \ --prefix=/usr --root=$PKG --optimize=1 else @@ -36,4 +38,6 @@ build() { /usr/bin/python setup.py install \ --prefix=/usr --root=$PKG --optimize=1 fi + + unset SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES } diff --git a/six/Pkgfile b/six/Pkgfile index a1627e040..4abc20b2e 100644 --- a/six/Pkgfile +++ b/six/Pkgfile @@ -16,10 +16,12 @@ build() { install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py build - PYTHONPATH=$SRC/build/usr/lib/python2.7/site-packages \ + PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py install \ --prefix=/usr --root=$PKG --optimize=1 else