Import buildroot 2016.02.01
This commit is contained in:
@@ -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('.'))}
|
||||
|
||||
15
firmware/buildroot/package/python-pyzmq/Config.in
Normal file
15
firmware/buildroot/package/python-pyzmq/Config.in
Normal file
@@ -0,0 +1,15 @@
|
||||
config BR2_PACKAGE_PYTHON_PYZMQ
|
||||
bool "python-pyzmq"
|
||||
depends on BR2_USE_WCHAR # zeromq
|
||||
depends on BR2_INSTALL_LIBSTDCPP # zeromq
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
|
||||
select BR2_PACKAGE_ZEROMQ
|
||||
help
|
||||
This package contains the python language binding for zeromq.
|
||||
|
||||
http://zeromq.org/bindings:python
|
||||
|
||||
comment "python-pyzmq needs a toolchain w/ C++, wchar, threads"
|
||||
depends on BR2_PACKAGE_PYTHON
|
||||
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
|
||||
BR2_TOOLCHAIN_HAS_THREADS)
|
||||
25
firmware/buildroot/package/python-pyzmq/python-pyzmq.mk
Normal file
25
firmware/buildroot/package/python-pyzmq/python-pyzmq.mk
Normal file
@@ -0,0 +1,25 @@
|
||||
################################################################################
|
||||
#
|
||||
# python-pyzmq
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_PYZMQ_VERSION = 14.3.1
|
||||
PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz
|
||||
PYTHON_PYZMQ_SITE = http://pypi.python.org/packages/source/p/pyzmq
|
||||
PYTHON_PYZMQ_LICENSE = LGPLv3+, BSD-3c, Apache-2.0
|
||||
# Apache license only online: http://www.apache.org/licenses/LICENSE-2.0
|
||||
PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD
|
||||
PYTHON_PYZMQ_DEPENDENCIES = zeromq
|
||||
PYTHON_PYZMQ_SETUP_TYPE = distutils
|
||||
PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr
|
||||
|
||||
# Due to issues with cross-compiling, hardcode to the zeromq in BR
|
||||
define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION
|
||||
$(SED) 's/##ZEROMQ_VERSION##/$(ZEROMQ_VERSION)/' \
|
||||
$(@D)/buildutils/detect.py
|
||||
endef
|
||||
|
||||
PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION
|
||||
|
||||
$(eval $(python-package))
|
||||
Reference in New Issue
Block a user