diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:08:31 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:13:17 +0200 |
| commit | 721e4cbb529d247c9c1ebef68275e70a3086ae0b (patch) | |
| tree | 2967ef4e10e2592661f664df4515d67dbc80cfe5 /package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch | |
| parent | 89920e9735cb561dccf1e1f81d35788fd10a655b (diff) | |
| parent | cec266ee1f708f11cc679cb4f81613fa4186003c (diff) | |
| download | buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.gz buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch')
| -rw-r--r-- | package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch b/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch index cb52eaf6de..461ef4e5fe 100644 --- a/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch +++ b/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch @@ -15,19 +15,22 @@ dynamically, return the version of the buildroot environment. Written by Michael Rommel, modified for version 16.0.2 by Lionel Flandrin. +Modified for version 17.1.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 9520da7..823144f 100644 +index cb14a8d..b33a3b5 100644 --- a/buildutils/detect.py +++ b/buildutils/detect.py -@@ -117,13 +117,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs): +@@ -116,13 +116,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs): cc = get_compiler(compiler=compiler, **compiler_attrs) - efile = test_compilation(cfile, compiler=cc) + efile = test_compilation(cfile, compiler=cc, **compiler_attrs) - patch_lib_paths(efile, cc.library_dirs) + #patch_lib_paths(efile, cc.library_dirs) @@ -47,5 +50,5 @@ index 9520da7..823144f 100644 handlers = {'vers': lambda val: tuple(int(v) for v in val.split('.'))} -- -2.11.0 +2.17.1 |
