[packages/python3] sys.prefix as default install prefix if not /usr

jajcus jajcus at pld-linux.org
Tue Dec 1 18:50:32 CET 2015


commit 595077ba8eae216947807a50d9c89739b428ab9e
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Tue Dec 1 18:47:30 2015 +0100

    sys.prefix as default install prefix if not /usr
    
    virtualenv expects sys.prefix change to affect distutils
    default installation prefix.

 python3-install_prefix.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/python3-install_prefix.patch b/python3-install_prefix.patch
index 1b5a45c..a643c08 100644
--- a/python3-install_prefix.patch
+++ b/python3-install_prefix.patch
@@ -23,14 +23,16 @@ diff -dur -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/command/install.py
 diff -dur -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/sysconfig.py Python-3.5.0/Lib/distutils/sysconfig.py
 --- Python-3.5.0.orig/Lib/distutils/sysconfig.py	2015-11-25 17:54:32.000000000 +0100
 +++ Python-3.5.0/Lib/distutils/sysconfig.py	2015-11-25 18:03:39.338573134 +0100
-@@ -17,8 +17,8 @@
+@@ -17,8 +17,12 @@
  from .errors import DistutilsPlatformError
  
  # These are needed in a couple of spots, so just compute them once.
--PREFIX = os.path.normpath(sys.prefix)
--EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
-+PREFIX = "/usr/local"
-+EXEC_PREFIX = PREFIX
+ PREFIX = os.path.normpath(sys.prefix)
+ EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++if PREFIX == "/usr":
++    PREFIX = "/usr/local"
++if EXEC_PREFIX == "/usr":
++    EXEC_PREFIX = "/usr/local"
  BASE_PREFIX = os.path.normpath(sys.base_prefix)
  BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3.git/commitdiff/d71cea9f76b2bc470dfaf5bfb24d2fa00f45b5f8



More information about the pld-cvs-commit mailing list