generated from gaoyang3513/SDK_RK3288
[Mod] First commit
This commit is contained in:
@ -0,0 +1,54 @@
|
||||
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.
|
||||
|
||||
Written by Michael Rommel, modified for version 16.0.2 by Lionel
|
||||
Flandrin.
|
||||
|
||||
Modified for version 18.0.2 by Asaf Kahlon
|
||||
|
||||
Signed-off-by: Lionel Flandrin <lionel@svkt.org>
|
||||
Signed-off-by: Asaf Kahlon <asafka7@gmail.com>
|
||||
---
|
||||
buildutils/detect.py | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/buildutils/detect.py b/buildutils/detect.py
|
||||
index d1380fe..4a91351 100644
|
||||
--- a/buildutils/detect.py
|
||||
+++ b/buildutils/detect.py
|
||||
@@ -120,13 +120,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs):
|
||||
|
||||
cc = get_compiler(compiler=compiler, **compiler_attrs)
|
||||
efile = test_compilation(cfile, compiler=cc, **compiler_attrs)
|
||||
- patch_lib_paths(efile, cc.library_dirs)
|
||||
+ #patch_lib_paths(efile, cc.library_dirs)
|
||||
|
||||
- rc, so, se = get_output_error([efile])
|
||||
- if rc:
|
||||
- msg = "Error running version detection script:\n%s\n%s" % (so,se)
|
||||
- logging.error(msg)
|
||||
- raise IOError(msg)
|
||||
+ #rc, so, se = get_output_error([efile])
|
||||
+ # if rc:
|
||||
+ # 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('.'))}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
12
package/python-pyzmq/Config.in
Normal file
12
package/python-pyzmq/Config.in
Normal file
@ -0,0 +1,12 @@
|
||||
config BR2_PACKAGE_PYTHON_PYZMQ
|
||||
bool "python-pyzmq"
|
||||
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++, threads"
|
||||
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
|
||||
6
package/python-pyzmq/python-pyzmq.hash
Normal file
6
package/python-pyzmq/python-pyzmq.hash
Normal file
@ -0,0 +1,6 @@
|
||||
# md5, sha256 from https://pypi.org/pypi/pyzmq/json
|
||||
md5 200abc1a75bdcfff7adf61304f46f55e pyzmq-19.0.2.tar.gz
|
||||
sha256 296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438 pyzmq-19.0.2.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD
|
||||
sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER
|
||||
29
package/python-pyzmq/python-pyzmq.mk
Normal file
29
package/python-pyzmq/python-pyzmq.mk
Normal file
@ -0,0 +1,29 @@
|
||||
################################################################################
|
||||
#
|
||||
# python-pyzmq
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_PYZMQ_VERSION = 19.0.2
|
||||
PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz
|
||||
PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/05/77/7483975d84fe1fd24cc67881ba7810e0e7b3ee6c2a0e002a5d6703cca49b
|
||||
PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, 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
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y)
|
||||
PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts
|
||||
endif
|
||||
|
||||
$(eval $(python-package))
|
||||
Reference in New Issue
Block a user