diff options
author | Michael Rommel <rommel@layer-7.net> | 2013-09-14 16:44:00 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-09-18 09:28:47 +0200 |
commit | 53722e54d08e31f007fa6a1682495eae725eccdf (patch) | |
tree | ef192cc1990b81ac296b4b504ba9edef6dadba8a /package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch | |
parent | 58da9b6f7d3740b971afc017401e1a50f803dcfa (diff) | |
download | buildroot-53722e54d08e31f007fa6a1682495eae725eccdf.tar.gz buildroot-53722e54d08e31f007fa6a1682495eae725eccdf.zip |
python-pyzmq: new package
The python language bindings for ZeroMQ.
[Peter: moved version note to .mk, single toolchain deps line]
Signed-off-by: Michael Rommel <rommel@layer-7.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch')
-rw-r--r-- | package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch b/package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch new file mode 100644 index 0000000000..560606989e --- /dev/null +++ b/package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch @@ -0,0 +1,43 @@ +detect.py: fix the ZMQ version check to the ZMQ version of the buildroot + +The setup.py script tries to compile a test C program and runs it, to +retrieve a version string for the installed ZMQ library, but if the cross +compiler links it together, the result cannot be run on the host, due to +different architectures and libraries. + +And if the host compiler would compile/link it, it would not link with the +library version inside buildroot but with the library from the host, possibly returning a wrong version number. + +Instead of trying to run the compiled test program to get the version +dynamically, return the version of the buildroot environment. + +Signed-off-by: Michael Rommel <rommel@layer-7.net> + +--- pyzmq-13.0.2/buildutils/detect.py.orig 2013-08-10 00:49:28.242557978 +0200 ++++ pyzmq-13.0.2/buildutils/detect.py 2013-08-10 00:44:35.197572704 +0200 +@@ -119,15 +119,17 @@ def detect_zmq(basedir, compiler=None, * + + efile = test_compilation(cfile, compiler=compiler, **compiler_attrs) + +- result = Popen(efile, stdout=PIPE, stderr=PIPE) +- so, se = result.communicate() ++ # result = Popen(efile, stdout=PIPE, stderr=PIPE) ++ # so, se = result.communicate() + # for py3k: +- so = so.decode() +- se = se.decode() +- if result.returncode: +- msg = "Error running version detection script:\n%s\n%s" % (so,se) +- logging.error(msg) +- raise IOError(msg) ++ #so = so.decode() ++ #se = se.decode() ++ #if result.returncode: ++ # msg = "Error running version detection script:\n%s\n%s" % (so,se) ++ # logging.error(msg) ++ # raise IOError(msg) ++ ++ so = "vers: ##ZEROMQ_VERSION##" + + handlers = {'vers': lambda val: tuple(int(v) for v in val.split('.'))} + |