diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /security/py-m2crypto/files/patch-setup.py | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'security/py-m2crypto/files/patch-setup.py')
| -rw-r--r-- | security/py-m2crypto/files/patch-setup.py | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/security/py-m2crypto/files/patch-setup.py b/security/py-m2crypto/files/patch-setup.py index 6e2719d77feb..df3db2ca45ac 100644 --- a/security/py-m2crypto/files/patch-setup.py +++ b/security/py-m2crypto/files/patch-setup.py @@ -1,35 +1,31 @@ ---- setup.py.orig 2024-10-09 22:15:33 UTC +--- setup.py.orig 2025-10-01 23:07:58 UTC +++ setup.py -@@ -164,11 +164,6 @@ class _M2CryptoBuildExt(build_ext.build_ext): - log.debug('self.openssl_path = %s', self.openssl_path) - log.debug('self.bundledlls = %s', self.bundledlls) +@@ -168,9 +168,6 @@ class _M2CryptoBuildExt(build_ext.build_ext): + log.debug("self.openssl_path = %s", self.openssl_path) + log.debug("self.bundledlls = %s", self.bundledlls) - # swig seems to need the default header file directories -- self.swig_opts.extend( -- ['-I%s' % i for i in _get_additional_includes()] -- ) +- 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) + log.debug("self.include_dirs = %s", self.include_dirs) + log.debug("self.library_dirs = %s", self.library_dirs) -@@ -238,6 +233,11 @@ class _M2CryptoBuildExt(build_ext.build_ext): +@@ -237,6 +234,9 @@ class _M2CryptoBuildExt(build_ext.build_ext): f"gcc -E ended with return code {pid.returncode}" ) + # swig seems to need the default header file directories -+ self.swig_opts.extend( -+ ['-I%s' % i for i in _get_additional_includes()] -+ ) ++ 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: # @@ -257,7 +257,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): - '-I' + os.path.join(openssl_include_dir, 'openssl') - ) + if platform.system() == "Darwin": + self.swig_opts.append("-cpperraswarn") -- self.swig_opts.append('-includeall') -+ #self.swig_opts.append('-includeall') - self.swig_opts.append('-builtin') +- self.swig_opts.append("-includeall") ++ #self.swig_opts.append("-includeall") + self.swig_opts.append("-builtin") - build_dir = os.path.join(self.build_lib, 'M2Crypto') + build_dir = os.path.join(self.build_lib, "M2Crypto") |