From owner-svn-ports-all@freebsd.org Sat Dec 19 20:26:11 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 088584A90A9; Sat, 19 Dec 2020 20:26:11 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cyy1D0yslz4rYr; Sat, 19 Dec 2020 20:26:08 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 269BF23262; Sat, 19 Dec 2020 20:26:07 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BJKQ7LB030116; Sat, 19 Dec 2020 20:26:07 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BJKQ7Oj030115; Sat, 19 Dec 2020 20:26:07 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202012192026.0BJKQ7Oj030115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 19 Dec 2020 20:26:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558680 - head/security/py-m2crypto/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/security/py-m2crypto/files X-SVN-Commit-Revision: 558680 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2020 20:26:11 -0000 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 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'))