diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2015-02-03 14:52:07 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2015-02-03 14:52:56 +0100 |
commit | 298cd8eaa21a21eee85f9551a26ad294347b1d5a (patch) | |
tree | 249fa33b66f65e6daffdbfc8ca2e5399e8d89e61 /package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch | |
parent | dd798a45c571063595c45278e28ed4f614f2cf32 (diff) | |
download | buildroot-298cd8eaa21a21eee85f9551a26ad294347b1d5a.tar.gz buildroot-298cd8eaa21a21eee85f9551a26ad294347b1d5a.zip |
package/*: rename patches according to the new policy
Autogenerated from rename-patch.py (http://patchwork.ozlabs.org/patch/403345)
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
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, 0 insertions, 43 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 deleted file mode 100644 index 560606989e..0000000000 --- a/package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch +++ /dev/null @@ -1,43 +0,0 @@ -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('.'))} - |