From fe2412c95d8a3d5a08b962cd55e8a597f066218b Mon Sep 17 00:00:00 2001 From: srubenst Date: Fri, 12 Dec 2014 11:49:01 +0200 Subject: [PATCH] add patches to stop '/Library/Python/X.X/site-packages' from being added to sys.path --- .../003_system_library_path_in_sys_path.patch | 13 +++++++++++++ .../003_system_library_path_in_sys_path.patch | 13 +++++++++++++ .../003_system_library_path_in_sys_path.patch | 13 +++++++++++++ .../003_system_library_path_in_sys_path.patch | 13 +++++++++++++ .../003_system_library_path_in_sys_path.patch | 13 +++++++++++++ .../003_system_library_path_in_sys_path.patch | 13 +++++++++++++ .../003_system_library_path_in_sys_path.patch | 13 +++++++++++++ 7 files changed, 91 insertions(+) create mode 100644 plugins/python-build/share/python-build/patches/2.7.2/Python-2.7.2/003_system_library_path_in_sys_path.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/003_system_library_path_in_sys_path.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.4/Python-2.7.4/003_system_library_path_in_sys_path.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.5/Python-2.7.5/003_system_library_path_in_sys_path.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.6/Python-2.7.6/003_system_library_path_in_sys_path.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.7/Python-2.7.7/003_system_library_path_in_sys_path.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.8/Python-2.7.8/003_system_library_path_in_sys_path.patch diff --git a/plugins/python-build/share/python-build/patches/2.7.2/Python-2.7.2/003_system_library_path_in_sys_path.patch b/plugins/python-build/share/python-build/patches/2.7.2/Python-2.7.2/003_system_library_path_in_sys_path.patch new file mode 100644 index 00000000..a9587e56 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.2/Python-2.7.2/003_system_library_path_in_sys_path.patch @@ -0,0 +1,13 @@ +Only in .: 003_system_library_path_in_sys_path.patch +diff -ur ../Python-2.7.2/Lib/site.py ./Lib/site.py +--- ../Python-2.7.2/Lib/site.py 2014-12-12 10:59:47.000000000 +0200 ++++ ./Lib/site.py 2014-12-12 11:24:28.000000000 +0200 +@@ -312,7 +312,7 @@ + # locations. + from sysconfig import get_config_var + framework = get_config_var("PYTHONFRAMEWORK") +- if framework and "/%s.framework/"%(framework,) in prefix: ++ if False and framework and "/%s.framework/"%(framework,) in prefix: + sitepackages.append( + os.path.join("/Library", framework, + sys.version[:3], "site-packages")) diff --git a/plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/003_system_library_path_in_sys_path.patch b/plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/003_system_library_path_in_sys_path.patch new file mode 100644 index 00000000..e46f7721 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/003_system_library_path_in_sys_path.patch @@ -0,0 +1,13 @@ +Only in .: 003_system_library_path_in_sys_path.patch +diff -ur ../Python-2.7.3/Lib/site.py ./Lib/site.py +--- ../Python-2.7.3/Lib/site.py 2012-04-10 02:07:31.000000000 +0300 ++++ ./Lib/site.py 2014-12-12 11:35:33.000000000 +0200 +@@ -312,7 +312,7 @@ + # locations. + from sysconfig import get_config_var + framework = get_config_var("PYTHONFRAMEWORK") +- if framework: ++ if False and framework: + sitepackages.append( + os.path.join("/Library", framework, + sys.version[:3], "site-packages")) diff --git a/plugins/python-build/share/python-build/patches/2.7.4/Python-2.7.4/003_system_library_path_in_sys_path.patch b/plugins/python-build/share/python-build/patches/2.7.4/Python-2.7.4/003_system_library_path_in_sys_path.patch new file mode 100644 index 00000000..e46f7721 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.4/Python-2.7.4/003_system_library_path_in_sys_path.patch @@ -0,0 +1,13 @@ +Only in .: 003_system_library_path_in_sys_path.patch +diff -ur ../Python-2.7.3/Lib/site.py ./Lib/site.py +--- ../Python-2.7.3/Lib/site.py 2012-04-10 02:07:31.000000000 +0300 ++++ ./Lib/site.py 2014-12-12 11:35:33.000000000 +0200 +@@ -312,7 +312,7 @@ + # locations. + from sysconfig import get_config_var + framework = get_config_var("PYTHONFRAMEWORK") +- if framework: ++ if False and framework: + sitepackages.append( + os.path.join("/Library", framework, + sys.version[:3], "site-packages")) diff --git a/plugins/python-build/share/python-build/patches/2.7.5/Python-2.7.5/003_system_library_path_in_sys_path.patch b/plugins/python-build/share/python-build/patches/2.7.5/Python-2.7.5/003_system_library_path_in_sys_path.patch new file mode 100644 index 00000000..606b3bb9 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.5/Python-2.7.5/003_system_library_path_in_sys_path.patch @@ -0,0 +1,13 @@ +Only in .: 003_system_library_path_in_sys_path.patch +diff -ur ../Python-2.7.5/Lib/site.py ./Lib/site.py +--- ../Python-2.7.5/Lib/site.py 2013-05-12 06:32:44.000000000 +0300 ++++ ./Lib/site.py 2014-12-12 11:29:29.000000000 +0200 +@@ -300,7 +300,7 @@ + # locations. + from sysconfig import get_config_var + framework = get_config_var("PYTHONFRAMEWORK") +- if framework: ++ if False and framework: + sitepackages.append( + os.path.join("/Library", framework, + sys.version[:3], "site-packages")) diff --git a/plugins/python-build/share/python-build/patches/2.7.6/Python-2.7.6/003_system_library_path_in_sys_path.patch b/plugins/python-build/share/python-build/patches/2.7.6/Python-2.7.6/003_system_library_path_in_sys_path.patch new file mode 100644 index 00000000..606b3bb9 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.6/Python-2.7.6/003_system_library_path_in_sys_path.patch @@ -0,0 +1,13 @@ +Only in .: 003_system_library_path_in_sys_path.patch +diff -ur ../Python-2.7.5/Lib/site.py ./Lib/site.py +--- ../Python-2.7.5/Lib/site.py 2013-05-12 06:32:44.000000000 +0300 ++++ ./Lib/site.py 2014-12-12 11:29:29.000000000 +0200 +@@ -300,7 +300,7 @@ + # locations. + from sysconfig import get_config_var + framework = get_config_var("PYTHONFRAMEWORK") +- if framework: ++ if False and framework: + sitepackages.append( + os.path.join("/Library", framework, + sys.version[:3], "site-packages")) diff --git a/plugins/python-build/share/python-build/patches/2.7.7/Python-2.7.7/003_system_library_path_in_sys_path.patch b/plugins/python-build/share/python-build/patches/2.7.7/Python-2.7.7/003_system_library_path_in_sys_path.patch new file mode 100644 index 00000000..606b3bb9 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.7/Python-2.7.7/003_system_library_path_in_sys_path.patch @@ -0,0 +1,13 @@ +Only in .: 003_system_library_path_in_sys_path.patch +diff -ur ../Python-2.7.5/Lib/site.py ./Lib/site.py +--- ../Python-2.7.5/Lib/site.py 2013-05-12 06:32:44.000000000 +0300 ++++ ./Lib/site.py 2014-12-12 11:29:29.000000000 +0200 +@@ -300,7 +300,7 @@ + # locations. + from sysconfig import get_config_var + framework = get_config_var("PYTHONFRAMEWORK") +- if framework: ++ if False and framework: + sitepackages.append( + os.path.join("/Library", framework, + sys.version[:3], "site-packages")) diff --git a/plugins/python-build/share/python-build/patches/2.7.8/Python-2.7.8/003_system_library_path_in_sys_path.patch b/plugins/python-build/share/python-build/patches/2.7.8/Python-2.7.8/003_system_library_path_in_sys_path.patch new file mode 100644 index 00000000..cf6cb73a --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.8/Python-2.7.8/003_system_library_path_in_sys_path.patch @@ -0,0 +1,13 @@ +Only in .: 003_system_library_path_in_sys_path.patch +diff -ur ../Python-2.7.8/Lib/site.py ./Lib/site.py +--- ../Python-2.7.8/Lib/site.py 2014-06-30 05:05:30.000000000 +0300 ++++ ./Lib/site.py 2014-12-12 11:42:33.000000000 +0200 +@@ -300,7 +300,7 @@ + # locations. + from sysconfig import get_config_var + framework = get_config_var("PYTHONFRAMEWORK") +- if framework: ++ if False and framework: + sitepackages.append( + os.path.join("/Library", framework, + sys.version[:3], "site-packages"))