blob: c71b16fece4269074ec86ad23cdcc3d0bbb589b1 [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
8Upstream-status: Unknown
9---
10 setup.py | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-)
12
Brad Bishop316dfdd2018-06-25 12:45:53 -040013diff --git a/setup.py b/setup.py
14index 3407c82..15ed7cd 100644
15--- a/setup.py
16+++ b/setup.py
17@@ -127,7 +127,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
18 self.openssl = os.path.join(self.openssl, 'OpenSSL')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050019 else:
20 self.libraries = ['ssl', 'crypto']
21- self.openssl = '/usr'
22+ self.openssl = os.environ.get( "STAGING_DIR" )
23
24 def finalize_options(self):
25 '''Overloaded build_ext implementation to append custom openssl
Brad Bishop316dfdd2018-06-25 12:45:53 -040026@@ -143,8 +143,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
Patrick Williamsb48b7b42016-08-17 15:04:38 -050027 if _openssl and os.path.isdir(_openssl):
28 self.openssl = _openssl
29
30- self.include_dirs.append(os.path.join(self.openssl, 'include'))
31- openssl_library_dir = os.path.join(self.openssl, 'lib')
32+ self.include_dirs.append(os.environ.get( "STAGING_INCDIR" ))
33+ openssl_library_dir = os.environ.get( "STAGING_LIBDIR" )
34
35 if platform.system() == "Linux":
36 if _multiarch: # on Fedora/RHEL it is an empty string
Brad Bishop316dfdd2018-06-25 12:45:53 -040037--
382.7.4
39