2017-09-19 00:34:41 +02:00
|
|
|
From 9055171433d5f6beae90815e8c075dc1e0938936 Mon Sep 17 00:00:00 2001
|
2016-01-04 19:23:28 +01:00
|
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
|
Date: Wed, 23 Dec 2015 11:36:27 +0100
|
|
|
|
|
Subject: [PATCH] Don't add multiarch paths
|
2014-07-08 22:17:53 +02:00
|
|
|
|
|
|
|
|
The add_multiarch_paths() function leads, in certain build
|
|
|
|
|
environments, to the addition of host header paths to the CFLAGS,
|
|
|
|
|
which is not appropriate for cross-compilation. This patch fixes that
|
|
|
|
|
by simply removing the call to add_multiarch_paths() when we're
|
|
|
|
|
cross-compiling.
|
|
|
|
|
|
|
|
|
|
Investigation done by David <buildroot-2014@inbox.com>.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
2016-01-04 19:23:28 +01:00
|
|
|
---
|
|
|
|
|
setup.py | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
2014-07-08 22:17:53 +02:00
|
|
|
|
2016-01-04 19:23:28 +01:00
|
|
|
diff --git a/setup.py b/setup.py
|
2017-09-19 00:34:41 +02:00
|
|
|
index cd00fbdbda..c956fa08d1 100644
|
2014-07-08 22:17:53 +02:00
|
|
|
--- a/setup.py
|
|
|
|
|
+++ b/setup.py
|
python3: bump to 3.7.0
Other changes include:
- Refreshing all necessary patches for 3.7.0
- Add a hash for the license file.
- Python no longer has it's own internal libffi, as such, host-libffi
is now required to build host-python3, and is added as a
dependency.
- Drop PYTHON3_LIBTOOL_PATCH = NO, since there is no longer any
internal libffi copy that was causing the libtool patching process
to fail.
- A new core module "uuid" is now is added in the Config.in file, and
relies on util-linux's uuid library.
- Also, a new patch: 0030-Fix-cross-compiling-the-uuid-module.patch
is required to fix compiling the uuid module, because the include
directory search path for uuid.h is hardcoded to /usr/include/uuid,
which causes an "unsafe for cross-compilation" error during
compiling if the host pc has uuid headers installed.
- 0031-Add-an-option-to-disable-uuid-module.patch is added to allow
disabling the Python3 UUID module, so that when
BR2_PACKAGE_PYTHON3_UUID is disabled by the UUID library is
present, the uuid Python module is not built, as expected.
- 0032-fix-building-on-older-distributions.patch is added to change
os.replace by os.rename in the update_file.py script to fix
building on older Linux distributions that have older versions of
python that don't include os.replace.
os.rename acts in the same way as os.replace, but is cross-platform
compatible. Because Buildroot is guaranteed to be built in a POSIX
environment, it is safe to change replace to rename.
Tested on CentOS6 and Fedora28, All test results passed:
br-arm-full [1/6]: OK
br-arm-cortex-a9-glibc [2/6]: OK
br-arm-cortex-m4-full [3/6]: SKIPPED
br-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: SKIPPED
armv5-ctng-linux-gnueabi [6/6]: OK
6 builds, 2 skipped, 0 build failed, 0 legal-info failed
Signed-off-by: Adam Duskett <aduskett@gmail.com>
[Thomas:
- remove PYTHON3_LIBTOOL_PATCH = NO
- improve the solution in patch 0030-Fix-cross-compiling-the-uuid-module
- add patch 0031-Add-an-option-to-disable-uuid-module]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-07-20 18:10:21 +02:00
|
|
|
@@ -547,10 +547,10 @@ class PyBuildExt(build_ext):
|
2014-07-08 22:17:53 +02:00
|
|
|
if not cross_compiling:
|
|
|
|
|
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
|
|
|
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
|
|
|
+ self.add_multiarch_paths()
|
|
|
|
|
# only change this for cross builds for 3.3, issues on Mageia
|
|
|
|
|
if cross_compiling:
|
|
|
|
|
self.add_gcc_paths()
|
|
|
|
|
- self.add_multiarch_paths()
|
|
|
|
|
|
|
|
|
|
# Add paths specified in the environment variables LDFLAGS and
|
|
|
|
|
# CPPFLAGS for header and library files.
|
2016-01-04 19:23:28 +01:00
|
|
|
--
|
2017-09-19 00:34:41 +02:00
|
|
|
2.13.5
|
2016-01-04 19:23:28 +01:00
|
|
|
|
