svn commit: r558680 - head/security/py-m2crypto/files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Dec 19 20:26:06 2020
New Revision: 558680
URL: https://svnweb.freebsd.org/changeset/ports/558680

Log:
  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 at larsendata.dk>

Modified:
  head/security/py-m2crypto/files/patch-setup.py

Modified: head/security/py-m2crypto/files/patch-setup.py
==============================================================================
--- head/security/py-m2crypto/files/patch-setup.py	Sat Dec 19 20:25:59 2020	(r558679)
+++ head/security/py-m2crypto/files/patch-setup.py	Sat Dec 19 20:26:06 2020	(r558680)
@@ -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'))