0001-setup.py-move-swig-default-includes-before-openssl.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263
  1. From 1aab31787a8d1ef9436d9cf81832691f729b6282 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Sat, 7 Nov 2020 23:26:30 +0100
  4. Subject: [PATCH] setup.py: move swig default includes before openssl
  5. Move swig default includes before openssl to avoid the following build
  6. failure when cross-compiling for some architectures (e.g. arm, mips):
  7. swig -python -py3 -D__x86_64__ \
  8. -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/python3.9 \
  9. -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include \
  10. -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/openssl \
  11. -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/include \
  12. -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/include-fixed \
  13. -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/../../../../mipsel-buildroot-linux-gnu/include \
  14. -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include \
  15. -includeall -modern -builtin -outdir \
  16. /srv/storage/autobuild/run/instance-0/output-1/build/python-m2crypto-0.36.0/M2Crypto -o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i
  17. Deprecated command line option: -modern. This option is now always on.
  18. /srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/bits/types.h:139:
  19. Error: CPP #error "". Use the -cpperraswarn option to continue swig processing.
  20. This build failure is probably raised because swig includes a wrong types.h file
  21. from the openssl directory (e.g.
  22. /srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include)
  23. Fixes:
  24. - http://autobuild.buildroot.org/results/7f63e6a2d8681cc3408f344556afd5dd16eb7368
  25. - http://autobuild.buildroot.org/results/d115a082418321e7dc4715c635f94b30b3cad387
  26. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  27. [Upstream status:
  28. https://gitlab.com/m2crypto/m2crypto/-/merge_requests/248]
  29. ---
  30. setup.py | 5 +++--
  31. 1 file changed, 3 insertions(+), 2 deletions(-)
  32. diff --git a/setup.py b/setup.py
  33. index 89d03bb..0045fda 100644
  34. --- a/setup.py
  35. +++ b/setup.py
  36. @@ -154,6 +154,9 @@ class _M2CryptoBuildExt(build_ext.build_ext):
  37. if sys.version_info[:1] >= (3,):
  38. self.swig_opts.append('-py3')
  39. + # swig seems to need the default header file directories
  40. + self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()])
  41. +
  42. log.debug('self.include_dirs = %s', self.include_dirs)
  43. log.debug('self.library_dirs = %s', self.library_dirs)
  44. @@ -204,8 +207,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
  45. self.swig_opts.append(
  46. '-I' + os.path.join(openssl_include_dir, 'openssl'))
  47. - # swig seems to need the default header file directories
  48. - self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()])
  49. self.swig_opts.append('-includeall')
  50. self.swig_opts.append('-modern')
  51. self.swig_opts.append('-builtin')
  52. --
  53. 2.28.0