mirror of
https://git.busybox.net/buildroot.git
synced 2024-11-25 06:23:35 +08:00
python-netifaces: bump to 0.7
cross-compilation changes were applied upstream, so remove the patch Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
e9378d9f1e
commit
ec35c076e1
@ -1,54 +0,0 @@
|
||||
fix cross-compilation issues:
|
||||
|
||||
- don't execute cross-compiled binaries
|
||||
- pass LDFLAGS to linker
|
||||
|
||||
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
|
||||
---
|
||||
setup.py | 19 +++++++------------
|
||||
1 file changed, 7 insertions(+), 12 deletions(-)
|
||||
|
||||
Index: b/setup.py
|
||||
===================================================================
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -67,17 +67,8 @@
|
||||
libraries=libraries,
|
||||
debug=self.debug)
|
||||
if execute:
|
||||
- abspath = os.path.abspath(os.path.join(self.build_temp,
|
||||
- 'conftest'))
|
||||
- pipe = os.popen(abspath, 'r')
|
||||
- result = pipe.read().strip()
|
||||
- status = pipe.close()
|
||||
- if status is None:
|
||||
- status = 0
|
||||
- if result == '':
|
||||
- result = True
|
||||
- if status != 0:
|
||||
- result = False
|
||||
+ # cross-compiled code can't be executed
|
||||
+ result = True
|
||||
|
||||
finally:
|
||||
os.dup2(mystdout, 1)
|
||||
@@ -89,6 +80,10 @@
|
||||
return result
|
||||
|
||||
def check_requirements(self):
|
||||
+ # get library dirs
|
||||
+ if os.environ.has_key('LDFLAGS'):
|
||||
+ lib_dirs = os.environ['LDFLAGS']
|
||||
+
|
||||
# Load the cached config data from a previous run if possible; compiling
|
||||
# things to test for features is slow
|
||||
cache_file = os.path.join(self.build_temp, 'config.cache')
|
||||
@@ -356,7 +351,7 @@
|
||||
in optional_headers]),
|
||||
'sockaddr': sockaddr }
|
||||
|
||||
- if self.test_build(testrig, execute=False):
|
||||
+ if self.test_build(testrig, execute=False, library_dirs = [lib_dirs]):
|
||||
result.append(sockaddr)
|
||||
|
||||
if result:
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
PYTHON_NETIFACES_VERSION = 0.6
|
||||
PYTHON_NETIFACES_VERSION = 0.7
|
||||
PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
|
||||
PYTHON_NETIFACES_SITE = http://alastairs-place.net/projects/netifaces
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user