diff options
author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-03-03 16:24:09 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-07 17:32:08 +0100 |
commit | f9396d52d042111f6f76cb420d0b3e59e1048b37 (patch) | |
tree | feaa5531bf2d2760fbb916d3d5020a9d89587ea2 /meta/recipes-devtools | |
parent | 40daaa0c0504f9dc4bf121ab18c541185954b706 (diff) | |
download | poky-f9396d52d042111f6f76cb420d0b3e59e1048b37.tar.gz |
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.
(From OE-Core rev: f37dfc7907ae7bac08d40468ddde2e5b8bba030c)
(From OE-Core rev: db8bef336849570dd99900b173c44cc47b208058)
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 400743867de587579dee85388c30190f353f80c8)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.7.7.bb | 1 |
2 files changed, 30 insertions, 0 deletions
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 0000000000..acf8e1e9b5 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 85e8f86ad2b7dec0848cd55b8e810a5e2722b20a Mon Sep 17 00:00:00 2001 | ||
2 | From: Jeremy Puhlman <jpuhlman@mvista.com> | ||
3 | Date: Wed, 4 Mar 2020 00:06:42 +0000 | ||
4 | Subject: [PATCH] Don't search system for headers/libraries | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | ||
8 | --- | ||
9 | setup.py | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/setup.py b/setup.py | ||
13 | index 9da1b3a..59782c0 100644 | ||
14 | --- a/setup.py | ||
15 | +++ b/setup.py | ||
16 | @@ -674,8 +674,8 @@ class PyBuildExt(build_ext): | ||
17 | add_dir_to_list(self.compiler.include_dirs, | ||
18 | sysconfig.get_config_var("INCLUDEDIR")) | ||
19 | |||
20 | - system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] | ||
21 | - system_include_dirs = ['/usr/include'] | ||
22 | + system_lib_dirs = [] | ||
23 | + system_include_dirs = [] | ||
24 | # lib_dirs and inc_dirs are used to search for files; | ||
25 | # if a file is found in one of those directories, it can | ||
26 | # be assumed that no additional -I,-L directives are needed. | ||
27 | -- | ||
28 | 2.24.1 | ||
29 | |||
diff --git a/meta/recipes-devtools/python/python3_3.7.7.bb b/meta/recipes-devtools/python/python3_3.7.7.bb index 823eb2f8fd..0a78cdab44 100644 --- a/meta/recipes-devtools/python/python3_3.7.7.bb +++ b/meta/recipes-devtools/python/python3_3.7.7.bb | |||
@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
33 | SRC_URI_append_class-native = " \ | 33 | SRC_URI_append_class-native = " \ |
34 | file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ | 34 | file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ |
35 | file://12-distutils-prefix-is-inside-staging-area.patch \ | 35 | file://12-distutils-prefix-is-inside-staging-area.patch \ |
36 | file://0001-Don-t-search-system-for-headers-libraries.patch \ | ||
36 | " | 37 | " |
37 | SRC_URI_append_class-nativesdk = " \ | 38 | SRC_URI_append_class-nativesdk = " \ |
38 | file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \ | 39 | file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \ |