diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-12-19 20:26:06 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-12-19 20:26:06 +0000 |
| commit | 1645c0e0ccde1e437e49f0b1e37cd623c1217783 (patch) | |
| tree | 46323657376d5b7fe67a8efc20d4439ddb96967b /security/py-m2crypto | |
| parent | aef623f60b93ec258b6791668807b0188a037da1 (diff) | |
| download | ports-1645c0e0ccde1e437e49f0b1e37cd623c1217783.tar.gz ports-1645c0e0ccde1e437e49f0b1e37cd623c1217783.zip | |
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 <peter.larsen@larsendata.dk>
Notes
Notes:
svn path=/head/; revision=558680
Diffstat (limited to 'security/py-m2crypto')
| -rw-r--r-- | security/py-m2crypto/files/patch-setup.py | 20 |
1 files changed, 20 insertions, 0 deletions
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')) |