2
1

0001-setup.py-do-not-add-invalid-header-locations.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. From 03a4c313f42ea1bbdfc4c64a285b3930766c2b23 Mon Sep 17 00:00:00 2001
  2. From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  3. Date: Wed, 23 Dec 2015 11:28:34 +0100
  4. Subject: [PATCH] setup.py: do not add invalid header locations
  5. This piece of code incorrectly adds /usr/include to
  6. self.compiler.include_dirs, and results in the following invalid
  7. compilation line:
  8. /home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc
  9. -fPIC -Wno-unused-result -Werror=declaration-after-statement -DNDEBUG -g
  10. -O3 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
  11. -D_FILE_OFFSET_BITS=64 -pipe -Os
  12. -I./Include -I/usr/include -I. -IInclude
  13. -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include
  14. -I/home/thomas/projets/buildroot/output/build/python3-3.4.0b1/Include
  15. -I/home/thomas/projets/buildroot/output/build/python3-3.4.0b1
  16. -c /home/thomas/projets/buildroot/output/build/python3-3.4.0b1/Modules/_struct.c
  17. -o build/temp.linux-arm-3.4/home/thomas/projets/buildroot/output/build/python3-3.4.0b1/Modules/_struct.o
  18. cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories]
  19. The -I/usr/include is wrong when cross compiling, so we disable adding
  20. INCLUDEDIR and LIBDIR from the host when cross compiling.
  21. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  22. ---
  23. setup.py | 3 ++-
  24. 1 file changed, 2 insertions(+), 1 deletion(-)
  25. diff --git a/setup.py b/setup.py
  26. index 2779658..d3bf8e5 100644
  27. --- a/setup.py
  28. +++ b/setup.py
  29. @@ -493,7 +493,8 @@ class PyBuildExt(build_ext):
  30. add_dir_to_list(dir_list, directory)
  31. if os.path.normpath(sys.base_prefix) != '/usr' \
  32. - and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
  33. + and not sysconfig.get_config_var('PYTHONFRAMEWORK') \
  34. + and not cross_compiling:
  35. # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
  36. # (PYTHONFRAMEWORK is set) to avoid # linking problems when
  37. # building a framework with different architectures than
  38. --
  39. 2.6.4