cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change include order

Browse Source 
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>
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2020-12-19 20:26:06 +00:00
parent aef623f60b
commit 1645c0e0cc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=558680
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
security/py-m2crypto/files/patch-setup.py
View File

@ -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'))