mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
0d9ca0ba17
Fix QA warning:
WARNING: python-m2crypto-native-0.26.4-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch
0001-setup.py-link-in-sysroot-not-in-host-directories.patch
patching file setup.py
Hunk #1 succeeded at 127 with fuzz 1 (offset 65 lines).
Hunk #2 succeeded at 143 (offset 68 lines).
Now at patch 0001-setup.py-link-in-sysroot-not-in-host-directories.patch
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
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
|
|
|