mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 13:00:02 +00:00
Code Issues Projects Releases Wiki Activity

libtevent: upgrade 0.14.1 -> 0.16.0

Browse Source 
* Remove PACKAGECONFIG[libaio] as libaio is no longer required by
  libtevent.
* Refresh patches.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2024-01-01 15:49:56 +08:00
committed by Khem Raj
parent cf1dd83b6f
commit 03e1353cb7
4 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch
+44 -26
View File
@@ -1,4 +1,4 @@
From d9fd1c52d1646254944bfee37be611e04d4daddb Mon Sep 17 00:00:00 2001 From c2241d7a1371ece3b89dfdad4861dcf0a152d5d4 Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@cn.fujitsu.com> From: Wang Mingyu <wangmy@cn.fujitsu.com>
Date: Fri, 25 Dec 2020 15:03:17 +0900 Date: Fri, 25 Dec 2020 15:03:17 +0900
Subject: [PATCH] Add configure options for packages Subject: [PATCH] Add configure options for packages
@@ -6,7 +6,6 @@ Subject: [PATCH] Add configure options for packages
Add configure options for the following packages: Add configure options for the following packages:
- acl - acl
- attr - attr
- libaio
- libbsd - libbsd
- libcap - libcap
- valgrind - valgrind
@@ -24,16 +23,20 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
Update patch to version 0.14.1 Update patch to version 0.14.1
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Rebase to 0.16.0
Remove libaio option
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
--- ---
lib/replace/wscript | 85 +++++++++++++++++++++++++++++++++++---------- lib/replace/wscript | 100 +++++++++++++++++++++++++++++++-------------
wscript | 6 ++++ wscript | 6 +++
2 files changed, 73 insertions(+), 18 deletions(-) 2 files changed, 77 insertions(+), 29 deletions(-)
diff --git a/lib/replace/wscript b/lib/replace/wscript diff --git a/lib/replace/wscript b/lib/replace/wscript
index 5c2b750..28835ac 100644 index 77e655b..452c741 100644
--- a/lib/replace/wscript --- a/lib/replace/wscript
+++ b/lib/replace/wscript +++ b/lib/replace/wscript
@@ -25,6 +25,41 @@ def options(opt): @@ -25,6 +25,34 @@ def options(opt):
opt.PRIVATE_EXTENSION_DEFAULT('') opt.PRIVATE_EXTENSION_DEFAULT('')
opt.RECURSE('buildtools/wafsamba') opt.RECURSE('buildtools/wafsamba')
@@ -51,13 +54,6 @@ index 5c2b750..28835ac 100644
+ help=("Disable use of attr"), + help=("Disable use of attr"),
+ action="store_false", dest='enable_attr', default=False) + action="store_false", dest='enable_attr', default=False)
+ +
+ opt.add_option('--with-libaio',
+ help=("Enable use of libaio"),
+ action="store_true", dest='enable_libaio')
+ opt.add_option('--without-libaio',
+ help=("Disable use of libaio"),
+ action="store_false", dest='enable_libaio', default=False)
+
+ opt.add_option('--with-libbsd', + opt.add_option('--with-libbsd',
+ help=("Enable use of libbsd"), + help=("Enable use of libbsd"),
+ action="store_true", dest='enable_libbsd') + action="store_true", dest='enable_libbsd')
@@ -75,7 +71,7 @@ index 5c2b750..28835ac 100644
@Utils.run_once @Utils.run_once
def configure(conf): def configure(conf):
conf.RECURSE('buildtools/wafsamba') conf.RECURSE('buildtools/wafsamba')
@@ -38,12 +73,27 @@ def configure(conf): @@ -38,12 +66,24 @@ def configure(conf):
conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('HAVE_LIBREPLACE', 1)
conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
@@ -96,28 +92,25 @@ index 5c2b750..28835ac 100644
+ if Options.options.enable_attr: + if Options.options.enable_attr:
+ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h')
+ +
+ if Options.options.enable_libaio:
+ conf.CHECK_HEADERS('libaio.h')
+
+ if Options.options.enable_libcap: + if Options.options.enable_libcap:
+ conf.CHECK_HEADERS('sys/capability.h') + conf.CHECK_HEADERS('sys/capability.h')
+ +
conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h')
conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h')
conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h')
@@ -113,8 +163,9 @@ def configure(conf): @@ -113,8 +153,9 @@ def configure(conf):
conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') - conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h')
+ if Options.options.enable_valgrind: + if Options.options.enable_valgrind:
+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') + conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h')
conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
@@ -436,20 +487,18 @@ def configure(conf): @@ -443,31 +484,32 @@ def configure(conf):
strlcpy_in_bsd = False strlcpy_in_bsd = False
@@ -126,6 +119,17 @@ index 5c2b750..28835ac 100644
- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
- checklibc=True): - checklibc=True):
- strlcpy_in_bsd = True - strlcpy_in_bsd = True
- elif conf.env.enable_fuzzing:
- # Just to complicate it more, some versions of Honggfuzz have
- # got strlcpy and strlcat in libc, but not in <string.h>
- # (unless it is there coincidentally, on a BSD). Therefore we
- # can't use CHECK_FUNCS alone to decide whether to add the
- # headers to replace.h.
- #
- # As this is only known to happen on a fuzzing compiler, we'll
- # skip the check when not in fuzzing mode.
- conf.CHECK_HEADERS('bsd/string.h')
-
- if not conf.CHECK_FUNCS('getpeereid'): - if not conf.CHECK_FUNCS('getpeereid'):
- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
@@ -138,12 +142,26 @@ index 5c2b750..28835ac 100644
+ if Options.options.enable_libbsd: + if Options.options.enable_libbsd:
+ # libbsd on some platforms provides strlcpy and strlcat + # libbsd on some platforms provides strlcpy and strlcat
+ if not conf.CHECK_FUNCS('strlcpy strlcat'): + if not conf.CHECK_FUNCS('strlcpy strlcat'):
+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', + if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
+ checklibc=True) + checklibc=True):
+ strlcpy_in_bsd = True
+ elif conf.env.enable_fuzzing:
+ # Just to complicate it more, some versions of Honggfuzz have
+ # got strlcpy and strlcat in libc, but not in <string.h>
+ # (unless it is there coincidentally, on a BSD). Therefore we
+ # can't use CHECK_FUNCS alone to decide whether to add the
+ # headers to replace.h.
+ #
+ # As this is only known to happen on a fuzzing compiler, we'll
+ # skip the check when not in fuzzing mode.
+ conf.CHECK_HEADERS('bsd/string.h')
+
+ if not conf.CHECK_FUNCS('getpeereid'): + if not conf.CHECK_FUNCS('getpeereid'):
+ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
+ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
+ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
+ if not conf.CHECK_FUNCS('setproctitle_init'):
+ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
+ +
+ if not conf.CHECK_FUNCS('closefrom'): + if not conf.CHECK_FUNCS('closefrom'):
+ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
@@ -151,7 +169,7 @@ index 5c2b750..28835ac 100644
conf.CHECK_CODE(''' conf.CHECK_CODE('''
struct ucred cred; struct ucred cred;
diff --git a/wscript b/wscript diff --git a/wscript b/wscript
index 0f6e92f..5a54f3a 100644 index d912a8a..484a6fa 100644
--- a/wscript --- a/wscript
+++ b/wscript +++ b/wscript
@@ -28,6 +28,12 @@ def options(opt): @@ -28,6 +28,12 @@ def options(opt):
@@ -168,5 +186,5 @@ index 0f6e92f..5a54f3a 100644
def configure(conf): def configure(conf):
conf.RECURSE('lib/replace') conf.RECURSE('lib/replace')
-- --
2.34.1 2.25.1
meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From da1dc659fd351ff6283f843eeba5e0b3f7b2d584 Mon Sep 17 00:00:00 2001 From 2bb7bf2d945d4ea0dafe3858adc6b8faae18b1e8 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com> From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 24 Nov 2021 13:33:35 +0800 Date: Wed, 24 Nov 2021 13:33:35 +0800
Subject: [PATCH] Fix pyext_PATTERN for cross compilation Subject: [PATCH] Fix pyext_PATTERN for cross compilation
@@ -25,10 +25,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py
index a23bd01..af202e0 100644 index b2dd1a9..2bd3545 100644
--- a/third_party/waf/waflib/Tools/python.py --- a/third_party/waf/waflib/Tools/python.py
+++ b/third_party/waf/waflib/Tools/python.py +++ b/third_party/waf/waflib/Tools/python.py
@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): @@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'):
x = 'MACOSX_DEPLOYMENT_TARGET' x = 'MACOSX_DEPLOYMENT_TARGET'
if dct[x]: if dct[x]:
env[x] = conf.environ[x] = str(dct[x]) env[x] = conf.environ[x] = str(dct[x])
meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch
+5 -6
View File
@@ -1,19 +1,18 @@
From 82dc31b72e77f263574645092ba1597a8f1152e7 Mon Sep 17 00:00:00 2001 From ace8fed037ec3d03f65f861b4da217faff94015b Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@cn.fujitsu.com> From: Wang Mingyu <wangmy@cn.fujitsu.com>
Date: Fri, 25 Dec 2020 15:10:58 +0900 Date: Fri, 25 Dec 2020 15:10:58 +0900
Subject: [PATCH] avoid attr unless wanted Subject: [PATCH] avoid attr unless wanted
Upstream-Status: Inappropriate [embedded specific]
--- ---
Upstream-Status: Pending
lib/replace/wscript | 4 +--- lib/replace/wscript | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-) 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/replace/wscript b/lib/replace/wscript diff --git a/lib/replace/wscript b/lib/replace/wscript
index 21a746a..6be3276 100644 index 452c741..61fcde0 100644
--- a/lib/replace/wscript --- a/lib/replace/wscript
+++ b/lib/replace/wscript +++ b/lib/replace/wscript
@@ -968,8 +968,6 @@ def build(bld): @@ -983,8 +983,6 @@ def build(bld):
if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c'
if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c'
if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c'
@@ -22,7 +21,7 @@ index 21a746a..6be3276 100644
if not bld.CONFIG_SET('HAVE_CLOSEFROM'): if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
REPLACE_SOURCE += ' closefrom.c' REPLACE_SOURCE += ' closefrom.c'
@@ -984,7 +982,7 @@ def build(bld): @@ -999,7 +997,7 @@ def build(bld):
# hide_symbols=bld.BUILTIN_LIBRARY('replace'), # hide_symbols=bld.BUILTIN_LIBRARY('replace'),
private_library=True, private_library=True,
provide_builtin_linking=True, provide_builtin_linking=True,
meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb → meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb
+3 -4
View File
@@ -16,7 +16,7 @@ SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \
LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681"
SRC_URI[sha256sum] = "ef85fcaa80ffd2351036ba4b347630fef2a1ac3da964a7f1820466bad03cd00d" SRC_URI[sha256sum] = "1aa58f21017ed8c2f606ae84aa7e795b5439edd4dd5f68f1a388a7d6fb40f682"
inherit pkgconfig ptest waf-samba inherit pkgconfig ptest waf-samba
@@ -26,7 +26,6 @@ PACKAGECONFIG ??= "\
" "
PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl"
PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr"
PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio"
PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd"
PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap"
PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
@@ -35,8 +34,8 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr
S = "${WORKDIR}/tevent-${PV}" S = "${WORKDIR}/tevent-${PV}"
#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen # Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
#to cross Popen # to cross Popen
export WAF_NO_PREFORK="yes" export WAF_NO_PREFORK="yes"
EXTRA_OECONF += "--disable-rpath \ EXTRA_OECONF += "--disable-rpath \