From 1645c0e0ccde1e437e49f0b1e37cd623c1217783 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sat, 19 Dec 2020 20:26:06 +0000 Subject: [PATCH] Change include order Add SSL library path first, then default paths, e.g. /usr/include. It fixes build with SSL library from ports, e.g. DEFAULT_VERSIONS+=ssl=openssl. PR: 251838 Reported by: Peter Larsen --- security/py-m2crypto/files/patch-setup.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/security/py-m2crypto/files/patch-setup.py b/security/py-m2crypto/files/patch-setup.py index 0890a64585c8..c1bab3f7ee14 100644 --- a/security/py-m2crypto/files/patch-setup.py +++ b/security/py-m2crypto/files/patch-setup.py @@ -1,5 +1,25 @@ --- setup.py.orig 2020-12-08 18:29:38 UTC +++ setup.py +@@ -151,9 +151,6 @@ class _M2CryptoBuildExt(build_ext.build_ext): + if sys.version_info[:1] >= (3,): + self.swig_opts.append('-py3') + +- # swig seems to need the default header file directories +- self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) +- + log.debug('self.include_dirs = %s', self.include_dirs) + log.debug('self.library_dirs = %s', self.library_dirs) + +@@ -186,6 +183,9 @@ class _M2CryptoBuildExt(build_ext.build_ext): + + self.swig_opts.extend(['-I%s' % i for i in self.include_dirs]) + ++ # swig seems to need the default header file directories ++ self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) ++ + # Some Linux distributor has added the following line in + # /usr/include/openssl/opensslconf.h: + # @@ -204,7 +204,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): self.swig_opts.append( '-I' + os.path.join(openssl_include_dir, 'openssl'))