| From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 |
| From: Adam Duskett <aduskett@gmail.com> |
| Date: Fri, 20 Jul 2018 10:17:39 -0400 |
| Subject: [PATCH] Fix cross compiling the uuid module |
| |
| Python 3.7 has a new _uuid module, however, the include directory |
| search path for uuid.h is hardcoded to /usr/include/uuid, which should |
| not be used when cross-compiling. |
| |
| To fix this, use the same solution as the one used by the NIS |
| detection: append "uuid" to each of the include directories in |
| "inc_dirs", instead of hardcoding /usr/include/uuid. |
| |
| Signed-off-by: Adam Duskett <aduskett@gmail.com> |
| [Thomas: drop STAGING_DIR based solution, use a solution similar to |
| the one used for the NIS detection.] |
| Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> |
| --- |
| setup.py | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/setup.py b/setup.py |
| index 3d0c74bb7f..c7be85f352 100644 |
| --- a/setup.py |
| +++ b/setup.py |
| @@ -1779,7 +1779,8 @@ class PyBuildExt(build_ext): |
| |
| def detect_uuid(self): |
| # Build the _uuid module if possible |
| - uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"]) |
| + uuid_incs = find_file("uuid.h", self.inc_dirs, |
| + [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs]) |
| if uuid_incs is not None: |
| if self.compiler.find_library_file(self.lib_dirs, 'uuid'): |
| uuid_libs = ['uuid'] |
| -- |
| 2.25.1 |
| |
