1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
From 7f86be29df07fd6c371e3f4315cb7629c1b49eaa Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Tue, 20 Sep 2016 09:04:47 +0800
Subject: [PATCH] tdb: Add configure options for packages
Add configure options for the following packages:
- acl
- attr
- libaio
- libcap
- valgrind
Upstream-Status: Inappropriate [oe deterministic build specific]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
lib/replace/system/wscript_configure | 6 ++++-
lib/replace/wscript | 43 +++++++++++++++++++++++++++++++-----
wscript | 4 ++++
3 files changed, 46 insertions(+), 7 deletions(-)
mode change 100644 => 100755 wscript
diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure
index 2035474..10f9ae7 100644
--- a/lib/replace/system/wscript_configure
+++ b/lib/replace/system/wscript_configure
@@ -1,6 +1,10 @@
#!/usr/bin/env python
-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
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 145300d..c9e6a45 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -23,6 +23,22 @@ def set_options(opt):
opt.PRIVATE_EXTENSION_DEFAULT('')
opt.RECURSE('buildtools/wafsamba')
+ opt.add_option('--with-acl',
+ help=("Enable use of acl"),
+ action="store_true", dest='enable_acl', default=False)
+
+ opt.add_option('--with-attr',
+ help=("Enable use of attr"),
+ action="store_true", dest='enable_attr', default=False)
+
+ opt.add_option('--with-libaio',
+ help=("Enable use of libaio"),
+ action="store_true", dest='enable_libaio', default=False)
+
+ opt.add_option('--with-libcap',
+ help=("Enable use of libcap"),
+ action="store_true", dest='enable_libcap', default=False)
+
@Utils.run_once
def configure(conf):
conf.RECURSE('buildtools/wafsamba')
@@ -32,12 +48,25 @@ def configure(conf):
conf.DEFINE('HAVE_LIBREPLACE', 1)
conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
- 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('linux/types.h crypt.h locale.h compat.h')
+ conf.CHECK_HEADERS('compat.h ctype.h dustat.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('shadow.h sys/acl.h')
- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
+ conf.CHECK_HEADERS('shadow.h')
+ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h')
+
+ if Options.options.enable_acl:
+ conf.CHECK_HEADERS('acl/libacl.h sys/acl.h')
+
+ if Options.options.enable_attr:
+ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h')
+
+ if Options.options.enable_libaio:
+ conf.CHECK_HEADERS('libaio.h')
+
+ if Options.options.enable_libcap:
+ conf.CHECK_HEADERS('sys/capability.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/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h')
@@ -73,7 +102,9 @@ def configure(conf):
conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+ if Options.options.enable_valgrind:
+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.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('utmp.h utmpx.h lastlog.h')
diff --git a/wscript b/wscript
old mode 100644
new mode 100755
index 50b2286..eb5f90e
--- a/wscript
+++ b/wscript
@@ -66,6 +66,10 @@ def set_options(opt):
action="store_true", dest='disable_python', default=False)
+ opt.add_option('--with-valgrind',
+ help=("enable use of valgrind"),
+ action="store_true", dest='enable_valgrind', default=False)
+
def configure(conf):
conf.env.disable_tdb_mutex_locking = getattr(Options.options,
'disable_tdb_mutex_locking',
--
2.8.3
|