summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
blob: c71b16fece4269074ec86ad23cdcc3d0bbb589b1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Fri, 29 Mar 2013 15:17:17 +0100
Subject: [PATCH] setup.py: link in sysroot, not in host directories

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

Upstream-status: Unknown
---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 3407c82..15ed7cd 100644
--- a/setup.py
+++ b/setup.py
@@ -127,7 +127,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
                 self.openssl = os.path.join(self.openssl, 'OpenSSL')
         else:
             self.libraries = ['ssl', 'crypto']
-            self.openssl = '/usr'
+            self.openssl = os.environ.get( "STAGING_DIR" )
 
     def finalize_options(self):
         '''Overloaded build_ext implementation to append custom openssl
@@ -143,8 +143,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
         if _openssl and os.path.isdir(_openssl):
             self.openssl = _openssl
 
-        self.include_dirs.append(os.path.join(self.openssl, 'include'))
-        openssl_library_dir = os.path.join(self.openssl, 'lib')
+        self.include_dirs.append(os.environ.get( "STAGING_INCDIR" ))
+        openssl_library_dir = os.environ.get( "STAGING_LIBDIR" )
 
         if platform.system() == "Linux":
             if _multiarch:  # on Fedora/RHEL it is an empty string
-- 
2.7.4