mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-20 11:38:34 +00:00
Code Issues Projects Releases Wiki Activity

python3-gevent: use system libraries instead of embedding

Browse Source 
gevent by default will build its own c-ares and libuv, but that build
needs patches and embedded libraries are bad form.

DEPEND on the recipes instead, and turn off embedding.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
This commit is contained in:
Ross Burton
2021-11-18 16:11:33 +00:00
committed by Khem Raj
parent cf172e66fe
commit 2d63ec9476
2 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
meta-python/recipes-devtools/python/python-gevent/libev-conf.patch
View File

@@ -1,26 +0,0 @@
From 2294734ef9d5e2efb05820e9759a1635799bdea9 Mon Sep 17 00:00:00 2001
From: Andrej Rode <andrej.rode@ettus.com>
Date: Mon, 10 Apr 2017 19:25:18 -0700
Subject: [PATCH] libev: make configure crosscompile compatible
Signed-off-by: Andrej Rode <andrej.rode@ettus.com>
---
deps/libev/configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deps/libev/configure b/deps/libev/configure
index 743817e..96c2366 100755
--- a/deps/libev/configure
+++ b/deps/libev/configure
@@ -2208,7 +2208,7 @@ fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_link='$CC -static -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
2.10.2

26
meta-python/recipes-devtools/python/python3-gevent_21.8.0.bb
View File

@@ -7,27 +7,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65 \
file://NOTICE;md5=18108df3583462cafd457f024b9b09b5 \ file://NOTICE;md5=18108df3583462cafd457f024b9b09b5 \
file://deps/libev/LICENSE;md5=d6ad416afd040c90698edcdf1cbee347 \ file://deps/libev/LICENSE;md5=d6ad416afd040c90698edcdf1cbee347 \
" "
DEPENDS += "libevent" DEPENDS += "${PYTHON_PN}-greenlet libev c-ares"
DEPENDS += "${PYTHON_PN}-greenlet"
RDEPENDS:${PN} = "${PYTHON_PN}-greenlet \ RDEPENDS:${PN} = "${PYTHON_PN}-greenlet \
${PYTHON_PN}-mime \ ${PYTHON_PN}-mime \
${PYTHON_PN}-pprint \ ${PYTHON_PN}-pprint \
" "
FILESEXTRAPATHS:prepend := "${THISDIR}/python-gevent:"
SRC_URI:append = " \
file://libev-conf.patch;patch=1;pnum=1 \
"
SRC_URI[sha256sum] = "43e93e1a4738c922a2416baf33f0afb0a20b22d3dba886720bc037cd02a98575" SRC_URI[sha256sum] = "43e93e1a4738c922a2416baf33f0afb0a20b22d3dba886720bc037cd02a98575"
# The python-gevent has no autoreconf ability
# and the logic for detecting a cross compile is flawed
# so always force a cross compile
do_configure:append() {
sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/deps/libev/configure
sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/deps/c-ares/configure
}
inherit pypi setuptools3 inherit pypi setuptools3
# Don't embed libraries, link to the system instead
export GEVENTSETUP_EMBED = "0"
# Delete the embedded copies of libraries so we can't accidentally link to them
do_configure:append() {
rm -rf ${S}/deps
}