diff options
-rw-r--r-- | meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch | 66 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtdb/libtdb_1.3.16.bb (renamed from meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb) | 4 |
2 files changed, 28 insertions, 42 deletions
diff --git a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch index 272921e56..365b92da2 100644 --- a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch | |||
@@ -1,10 +1,7 @@ | |||
1 | From 24911f36bcb00412e5dc4cd11fda139e09d58798 Mon Sep 17 00:00:00 2001 | 1 | From 6de1affddde4003a956523c330ecf24e22e094ac Mon Sep 17 00:00:00 2001 |
2 | From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Tue, 1 Aug 2017 03:12:09 +0900 | 3 | Date: Thu, 19 Jul 2018 16:20:32 +0800 |
4 | Subject: [PATCH] From 10ac5e5fdda44adcc2a159b6f9a2d51a51361057 Mon Sep 17 | 4 | Subject: [PATCH] tdb: Add configure options for packages |
5 | 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 21 | ||
6 | Sep 2016 10:46:19 +0800 Subject: [PATCH] tdb: Add configure options for | ||
7 | packages | ||
8 | 5 | ||
9 | Add configure options for the following packages: | 6 | Add configure options for the following packages: |
10 | - acl | 7 | - acl |
@@ -21,30 +18,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
21 | Update for libtdb_1.3.14. | 18 | Update for libtdb_1.3.14. |
22 | 19 | ||
23 | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | 20 | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> |
21 | |||
22 | Update for libtdb_1.3.16 | ||
23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
24 | --- | 24 | --- |
25 | lib/replace/system/wscript_configure | 6 ++- | 25 | lib/replace/wscript | 89 +++++++++++++++++++++++++++++++++++++++++------------ |
26 | lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- | 26 | wscript | 6 ++++ |
27 | wscript | 7 ++- | 27 | 2 files changed, 75 insertions(+), 20 deletions(-) |
28 | 3 files changed, 79 insertions(+), 19 deletions(-) | ||
29 | 28 | ||
30 | diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure | ||
31 | index 2035474..10f9ae7 100644 | ||
32 | --- a/lib/replace/system/wscript_configure | ||
33 | +++ b/lib/replace/system/wscript_configure | ||
34 | @@ -1,6 +1,10 @@ | ||
35 | #!/usr/bin/env python | ||
36 | |||
37 | -conf.CHECK_HEADERS('sys/capability.h') | ||
38 | +import Options | ||
39 | + | ||
40 | +if Options.options.enable_libcap: | ||
41 | + conf.CHECK_HEADERS('sys/capability.h') | ||
42 | + | ||
43 | conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') | ||
44 | |||
45 | # solaris varients of getXXent_r | ||
46 | diff --git a/lib/replace/wscript b/lib/replace/wscript | 29 | diff --git a/lib/replace/wscript b/lib/replace/wscript |
47 | index 7c50e1d..15df5c3 100644 | 30 | index fd00a42..2df83cd 100644 |
48 | --- a/lib/replace/wscript | 31 | --- a/lib/replace/wscript |
49 | +++ b/lib/replace/wscript | 32 | +++ b/lib/replace/wscript |
50 | @@ -23,6 +23,41 @@ def set_options(opt): | 33 | @@ -23,6 +23,41 @@ def set_options(opt): |
@@ -96,7 +79,7 @@ index 7c50e1d..15df5c3 100644 | |||
96 | - conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') | 79 | - conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') |
97 | - conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') | 80 | - conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') |
98 | + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') | 81 | + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') |
99 | + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') | 82 | + conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h') |
100 | conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') | 83 | conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') |
101 | - conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') | 84 | - conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') |
102 | - conf.CHECK_HEADERS('shadow.h sys/acl.h') | 85 | - conf.CHECK_HEADERS('shadow.h sys/acl.h') |
@@ -120,9 +103,9 @@ index 7c50e1d..15df5c3 100644 | |||
120 | conf.CHECK_HEADERS('port.h') | 103 | conf.CHECK_HEADERS('port.h') |
121 | conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') | 104 | conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') |
122 | conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') | 105 | conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') |
123 | @@ -73,7 +121,9 @@ def configure(conf): | 106 | @@ -108,7 +156,9 @@ def configure(conf): |
124 | 107 | conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') | |
125 | conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') | 108 | conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') |
126 | 109 | ||
127 | - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') | 110 | - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') |
128 | + if Options.options.enable_valgrind: | 111 | + if Options.options.enable_valgrind: |
@@ -131,18 +114,21 @@ index 7c50e1d..15df5c3 100644 | |||
131 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') | 114 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') |
132 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') | 115 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') |
133 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') | 116 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') |
134 | @@ -251,17 +301,18 @@ def configure(conf): | 117 | @@ -342,20 +392,19 @@ def configure(conf): |
135 | 118 | ||
136 | conf.CHECK_FUNCS('prctl dirname basename') | 119 | strlcpy_in_bsd = False |
137 | 120 | ||
138 | - # libbsd on some platforms provides strlcpy and strlcat | 121 | - # libbsd on some platforms provides strlcpy and strlcat |
139 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): | 122 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): |
140 | - conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | 123 | - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', |
141 | - checklibc=True) | 124 | - checklibc=True): |
125 | - strlcpy_in_bsd = True | ||
142 | - if not conf.CHECK_FUNCS('getpeereid'): | 126 | - if not conf.CHECK_FUNCS('getpeereid'): |
143 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 127 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') |
144 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 128 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): |
145 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | 129 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') |
130 | - if not conf.CHECK_FUNCS('setproctitle_init'): | ||
131 | - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
146 | - | 132 | - |
147 | - if not conf.CHECK_FUNCS('closefrom'): | 133 | - if not conf.CHECK_FUNCS('closefrom'): |
148 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 134 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') |
@@ -158,18 +144,18 @@ index 7c50e1d..15df5c3 100644 | |||
158 | + | 144 | + |
159 | + if not conf.CHECK_FUNCS('closefrom'): | 145 | + if not conf.CHECK_FUNCS('closefrom'): |
160 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 146 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') |
147 | + | ||
161 | 148 | ||
162 | conf.CHECK_CODE(''' | 149 | conf.CHECK_CODE(''' |
163 | struct ucred cred; | 150 | struct ucred cred; |
164 | diff --git a/wscript b/wscript | 151 | diff --git a/wscript b/wscript |
165 | index 1c9655a..8c20d3b 100644 | 152 | index 6505648..6608481 100644 |
166 | --- a/wscript | 153 | --- a/wscript |
167 | +++ b/wscript | 154 | +++ b/wscript |
168 | @@ -62,7 +62,12 @@ def set_options(opt): | 155 | @@ -63,6 +63,12 @@ def set_options(opt): |
169 | help=("Disable the use of pthread robust mutexes"), | ||
170 | action="store_true", dest='disable_tdb_mutex_locking', | 156 | action="store_true", dest='disable_tdb_mutex_locking', |
171 | default=False) | 157 | default=False) |
172 | - | 158 | |
173 | + opt.add_option('--with-valgrind', | 159 | + opt.add_option('--with-valgrind', |
174 | + help=("enable use of valgrind"), | 160 | + help=("enable use of valgrind"), |
175 | + action="store_true", dest='enable_valgrind') | 161 | + action="store_true", dest='enable_valgrind') |
diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb b/meta-networking/recipes-support/libtdb/libtdb_1.3.16.bb index 302a306b3..112e89ea0 100644 --- a/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb +++ b/meta-networking/recipes-support/libtdb/libtdb_1.3.16.bb | |||
@@ -11,8 +11,8 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ | |||
11 | file://tdb-Add-configure-options-for-packages.patch \ | 11 | file://tdb-Add-configure-options-for-packages.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[md5sum] = "60ece3996acc8d85b6f713199da971a6" | 14 | SRC_URI[md5sum] = "7d06d8709188e07df853d9e91db88927" |
15 | SRC_URI[sha256sum] = "b4a1bf3833601bd9f10aff363cb750860aef9ce5b4617989239923192f946728" | 15 | SRC_URI[sha256sum] = "6a3fc2616567f23993984ada3cea97d953a27669ffd1bfbbe961f26e0cf96cc5" |
16 | 16 | ||
17 | PACKAGECONFIG ??= "\ | 17 | PACKAGECONFIG ??= "\ |
18 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ | 18 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ |