| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
| 3 | Date: Fri, 29 Mar 2013 15:17:17 +0100 |
| 4 | Subject: [PATCH] setup.py: link in sysroot, not in host directories |
| 5 | |
| 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
| 7 | |
| 8 | Upstream-status: Unknown |
| 9 | --- |
| 10 | setup.py | 6 +++--- |
| 11 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 12 | |
| 13 | Index: M2Crypto-0.23.0/setup.py |
| 14 | =================================================================== |
| 15 | --- M2Crypto-0.23.0.orig/setup.py |
| 16 | +++ M2Crypto-0.23.0/setup.py |
| 17 | @@ -62,7 +62,7 @@ class _M2CryptoBuildExt(build_ext.build_ |
| 18 | self.openssl = 'c:\\pkg' |
| 19 | 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 |
| 26 | @@ -75,8 +75,8 @@ class _M2CryptoBuildExt(build_ext.build_ |
| 27 | 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 |