[oe-commits] [openembedded-core] 07/11: python3-native: Should not search the system for headers/libraries.

[git at git.openembedded.org]

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

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

commit 8090c53d65fdbff97dca38bf16681f0a71c8ce5a
Author: Jeremy Puhlman <jpuhlman at mvista.com>
AuthorDate: Tue Mar 3 16:24:09 2020 -0800

    python3-native: Should not search the system for headers/libraries.
    
    The specific issue here is rpc/rpc.h, but its likely more general.
    /usr/include is searched for rpc/rpc.h and if it exists on the
    system, it changes behavior. If you are using the extended buildtools
    tarball on a machine that has /usr/include/rpc/rpc.h, it will decide
    that is good enough and not continue to search. nis fails to build
    because /usr/include and /usr/lib are not part of the include/link
    paths for the buildtools tarball compiler(nor should they be).
    
    This makes it so python3-native will not build if you are using the
    extended buildtools tarball, but from a larger issue perspective it
    is building in likely different ways depending on what machine it
    is building on.
    
    libtirpc is already a depend so we shouldn't need the hosts rpc/rcp.h.
    
    Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 ...Don-t-search-system-for-headers-libraries.patch | 29 ++++++++++++++++++++++
 meta/recipes-devtools/python/python3_3.8.1.bb      |  1 +
 2 files changed, 30 insertions(+)

diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
new file mode 100644
index 0000000..acf8e1e
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
@@ -0,0 +1,29 @@
+From 85e8f86ad2b7dec0848cd55b8e810a5e2722b20a Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman <jpuhlman at mvista.com>
+Date: Wed, 4 Mar 2020 00:06:42 +0000
+Subject: [PATCH] Don't search system for headers/libraries
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Jeremy Puhlman <jpuhlman at mvista.com>
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9da1b3a..59782c0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -674,8 +674,8 @@ class PyBuildExt(build_ext):
+             add_dir_to_list(self.compiler.include_dirs,
+                             sysconfig.get_config_var("INCLUDEDIR"))
+ 
+-        system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib']
+-        system_include_dirs = ['/usr/include']
++        system_lib_dirs = []
++        system_include_dirs = []
+         # lib_dirs and inc_dirs are used to search for files;
+         # if a file is found in one of those directories, it can
+         # be assumed that no additional -I,-L directives are needed.
+-- 
+2.24.1
+
diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb
index 7796852..5e3c29c 100644
--- a/meta/recipes-devtools/python/python3_3.8.1.bb
+++ b/meta/recipes-devtools/python/python3_3.8.1.bb
@@ -37,6 +37,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
 SRC_URI_append_class-native = " \
            file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \
            file://12-distutils-prefix-is-inside-staging-area.patch \
+           file://0001-Don-t-search-system-for-headers-libraries.patch \
            "
 
 SRC_URI[md5sum] = "b3fb85fd479c0bf950c626ef80cacb57"

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