mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-07 03:29:59 +00:00
Code Issues Projects Releases Wiki Activity

libtalloc: upgrade 2.1.11 -> 2.1.14

Browse Source 
Signed-off-by: Changqing Li <changqing.li@windriver.com>
This commit is contained in:
Changqing Li
2018-07-25 11:27:29 +08:00
committed by Khem Raj
parent ac53fb25cc
commit bbff397328
2 changed files with 43 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch → meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.14.patch
+40 -52
View File
@@ -1,6 +1,6 @@
From efc1b02144f23fdf84dbc5ff15307815e0f2a425 Mon Sep 17 00:00:00 2001 From 319a2a1bb46ae35fa9d66878cb08285035f0bd5f Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com> From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 14 Sep 2016 11:11:35 +0800 Date: Thu, 19 Jul 2018 15:41:31 +0800
Subject: [PATCH] talloc: Add configure options for packages Subject: [PATCH] talloc: Add configure options for packages
Add configure options for the following packages: Add configure options for the following packages:
@@ -19,36 +19,22 @@ Modified to apply to version 2.1.10.
Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Joe Slater <joe.slater@windriver.com>
Modified tp apply to version 2.1.14
Signed-off-by: Changqing Li <changqing.li@windriver.com>
--- ---
lib/replace/system/wscript_configure | 6 ++- lib/replace/wscript | 90 +++++++++++++++++++++++++++++++++++++++++------------
lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- wscript | 7 +++++
wscript | 7 ++- 2 files changed, 77 insertions(+), 20 deletions(-)
3 files changed, 79 insertions(+), 19 deletions(-)
Index: talloc-2.1.11/lib/replace/system/wscript_configure diff --git a/lib/replace/wscript b/lib/replace/wscript
=================================================================== index fd00a42..a77c058 100644
--- talloc-2.1.11.orig/lib/replace/system/wscript_configure --- a/lib/replace/wscript
+++ talloc-2.1.11/lib/replace/system/wscript_configure +++ b/lib/replace/wscript
@@ -1,6 +1,10 @@ @@ -22,6 +22,41 @@ def set_options(opt):
#!/usr/bin/env python opt.BUILTIN_DEFAULT('NONE')
-conf.CHECK_HEADERS('sys/capability.h')
+import Options
+
+if Options.options.enable_libcap:
+ conf.CHECK_HEADERS('sys/capability.h')
+
conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r')
# solaris varients of getXXent_r
Index: talloc-2.1.11/lib/replace/wscript
===================================================================
--- talloc-2.1.11.orig/lib/replace/wscript
+++ talloc-2.1.11/lib/replace/wscript
@@ -23,6 +23,41 @@ def set_options(opt):
opt.PRIVATE_EXTENSION_DEFAULT('') opt.PRIVATE_EXTENSION_DEFAULT('')
opt.RECURSE('buildtools/wafsamba') opt.RECURSE('buildtools/wafsamba')
+
+ opt.add_option('--with-acl', + opt.add_option('--with-acl',
+ help=("Enable use of acl"), + help=("Enable use of acl"),
+ action="store_true", dest='enable_acl') + action="store_true", dest='enable_acl')
@@ -83,10 +69,9 @@ Index: talloc-2.1.11/lib/replace/wscript
+ opt.add_option('--without-libcap', + opt.add_option('--without-libcap',
+ help=("Disable use of libcap"), + help=("Disable use of libcap"),
+ action="store_false", dest='enable_libcap', default=False) + action="store_false", dest='enable_libcap', default=False)
+
@Utils.run_once @Utils.run_once
def configure(conf): def configure(conf):
conf.RECURSE('buildtools/wafsamba')
@@ -32,12 +67,25 @@ def configure(conf): @@ -32,12 +67,25 @@ 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)
@@ -94,7 +79,7 @@ Index: talloc-2.1.11/lib/replace/wscript
- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') - conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
- conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') - conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
+ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h')
+ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') + conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h')
conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
- conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h')
@@ -118,9 +103,9 @@ Index: talloc-2.1.11/lib/replace/wscript
conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('port.h')
conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.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')
@@ -73,7 +121,9 @@ def configure(conf): @@ -108,7 +156,9 @@ def configure(conf):
conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+ if Options.options.enable_valgrind: + if Options.options.enable_valgrind:
@@ -129,19 +114,14 @@ Index: talloc-2.1.11/lib/replace/wscript
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')
@@ -267,21 +317,21 @@ def configure(conf): @@ -342,20 +392,20 @@ def configure(conf):
conf.CHECK_FUNCS('prctl dirname basename')
strlcpy_in_bsd = False strlcpy_in_bsd = False
-
- # 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'):
- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
+ if Options.options.enable_libbsd: - checklibc=True):
+ # libbsd on some platforms provides strlcpy and strlcat
+ if not conf.CHECK_FUNCS('strlcpy strlcat'):
+ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
checklibc=True):
- strlcpy_in_bsd = True - strlcpy_in_bsd = True
- 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')
@@ -149,6 +129,14 @@ Index: talloc-2.1.11/lib/replace/wscript
- 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'): - if not conf.CHECK_FUNCS('setproctitle_init'):
- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
-
- if not conf.CHECK_FUNCS('closefrom'):
- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
+ if Options.options.enable_libbsd:
+ # libbsd on some platforms provides strlcpy and strlcat
+ if not conf.CHECK_FUNCS('strlcpy strlcat'):
+ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
+ checklibc=True):
+ strlcpy_in_bsd = True + strlcpy_in_bsd = True
+ 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')
@@ -156,29 +144,29 @@ Index: talloc-2.1.11/lib/replace/wscript
+ 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'): + if not conf.CHECK_FUNCS('setproctitle_init'):
+ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
- if not conf.CHECK_FUNCS('closefrom'):
- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='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')
conf.CHECK_CODE(''' conf.CHECK_CODE('''
struct ucred cred; struct ucred cred;
Index: talloc-2.1.11/wscript diff --git a/wscript b/wscript
=================================================================== index 18f726e..fed8ab9 100644
--- talloc-2.1.11.orig/wscript --- a/wscript
+++ talloc-2.1.11/wscript +++ b/wscript
@@ -32,7 +32,12 @@ def set_options(opt): @@ -32,6 +32,13 @@ def set_options(opt):
opt.add_option('--enable-talloc-compat1', opt.add_option('--enable-talloc-compat1',
help=("Build talloc 1.x.x compat library [False]"), help=("Build talloc 1.x.x compat library [False]"),
action="store_true", dest='TALLOC_COMPAT1', default=False) action="store_true", dest='TALLOC_COMPAT1', default=False)
-
+ opt.add_option('--with-valgrind', + opt.add_option('--with-valgrind',
+ help=("enable use of valgrind"), + help=("enable use of valgrind"),
+ action="store_true", dest='enable_valgrind') + action="store_true", dest='enable_valgrind')
+ opt.add_option('--without-valgrind', + opt.add_option('--without-valgrind',
+ help=("disable use of valgrind"), + help=("disable use of valgrind"),
+ action="store_false", dest='enable_valgrind', default=False) + action="store_false", dest='enable_valgrind', default=False)
+
def configure(conf): def configure(conf):
conf.RECURSE('lib/replace') --
2.7.4
meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb → meta-networking/recipes-support/libtalloc/libtalloc_2.1.14.bb
+3 -3
View File
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6
SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \
file://options-2.1.10.patch \ file://options-2.1.14.patch \
" "
SRC_URI[md5sum] = "452596f904ca2b10322bdaabf147a721" SRC_URI[md5sum] = "7478da02e309316231a497a9f17a980d"
SRC_URI[sha256sum] = "639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3" SRC_URI[sha256sum] = "b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce"
inherit waf-samba inherit waf-samba