blob: 85423a3fece0a109acae119e07a9ea0991d03369 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001
Patrick Williamsb48b7b42016-08-17 15:04:38 -05002From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Fri, 29 Mar 2013 15:17:17 +0100
4Subject: [PATCH] setup.py: link in sysroot, not in host directories
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7
Patrick Williamsb9af8752023-01-30 13:28:01 -06008Upstream-Status: Unknown
Patrick Williamsb48b7b42016-08-17 15:04:38 -05009---
10 setup.py | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-)
12
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050013--- a/setup.py
14+++ b/setup.py
15@@ -135,6 +135,7 @@ class _M2CryptoBuildExt(build_ext.build_
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080016 self.set_undefined_options('build', ('bundledlls', 'bundledlls'))
Patrick Williamsb48b7b42016-08-17 15:04:38 -050017
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080018 self.libraries = ['ssl', 'crypto']
19+ self.openssl = os.environ.get( "STAGING_DIR" )
20 if sys.platform == 'win32':
21 self.libraries = ['ssleay32', 'libeay32']
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050022 if self.openssl and openssl_version(self.openssl,
23@@ -159,8 +160,8 @@ class _M2CryptoBuildExt(build_ext.build_
Patrick Williamsb48b7b42016-08-17 15:04:38 -050024
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080025 if self.openssl is not None:
26 log.debug('self.openssl = %s', self.openssl)
27- openssl_library_dir = os.path.join(self.openssl, 'lib')
28- openssl_include_dir = os.path.join(self.openssl, 'include')
29+ openssl_library_dir = os.environ.get( "STAGING_LIBDIR" )
30+ openssl_include_dir = os.environ.get( "STAGING_INCDIR" )
Patrick Williamsb48b7b42016-08-17 15:04:38 -050031
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080032 self.library_dirs.append(openssl_library_dir)
33 self.include_dirs.append(openssl_include_dir)