[oe-commits] [openembedded-core] 20/20: python3: Fix install purelib to make pip3-python work properly

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 45afadf0b652922f9e60c5a778acd3612da83306
Author: Jason Wessel <jason.wessel at windriver.com>
AuthorDate: Wed Mar 7 12:00:37 2018 -0800

    python3: Fix install purelib to make pip3-python work properly
    
    The oe-core version of python3 patches the purelib use directory to
    the system libdir so as to make it work with multilibs properly inside
    the patch fix_for_using_different_libdir.patch with:
    
    -        'purelib': '{base}/lib/python{py_version_short}/site-packages',
    +        'purelib': '{base}/'+sys.lib+'/python{py_version_short}/site-packages',
    
    The problem is that this broke the pip3-python package because the
    install directory is out of sync when using a multilib version of
    python.  When ever a module is installed with pip3 install that is a
    purelib it will get installed to a location that python3 will never
    reference and cause random failures.
    
    This patch fixes the purelib install directory to match the purelib
    use directory for externally managed python modules when using
    multilibs.
    
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-devtools/python/python/multilib.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch
index f5568d2..94fdfeb 100644
--- a/meta/recipes-devtools/python/python/multilib.patch
+++ b/meta/recipes-devtools/python/python/multilib.patch
@@ -41,11 +41,13 @@ Index: Python-2.7.13/Lib/distutils/command/install.py
  if sys.version < "2.2":
      WINDOWS_SCHEME = {
          'purelib': '$base',
-@@ -42,7 +44,7 @@ else:
+@@ -41,8 +43,8 @@ else:
+ 
  INSTALL_SCHEMES = {
      'unix_prefix': {
-         'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'purelib': '$base/lib/python$py_version_short/site-packages',
 -        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'purelib': '$platbase/'+libname+'/python$py_version_short/site-packages',
 +        'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
          'headers': '$base/include/python$py_version_short/$dist_name',
          'scripts': '$base/bin',

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.