diff options
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch (renamed from meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch) | 38 | ||||
-rw-r--r-- | meta-networking/recipes-support/libldb/libldb_1.3.1.bb (renamed from meta-networking/recipes-support/libldb/libldb_1.2.2.bb) | 6 |
2 files changed, 30 insertions, 14 deletions
diff --git a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch index 93bd4578e..ffe253b63 100644 --- a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 49dde22e798fd7f39fd59250036c0ae1fe2b9152 Mon Sep 17 00:00:00 2001 | 1 | From a4da3ab4d76013aaa731d43d52ccca1ebd37c395 Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
3 | Date: Wed, 21 Sep 2016 10:06:39 +0800 | 3 | Date: Wed, 21 Sep 2016 10:06:39 +0800 |
4 | Subject: [PATCH] ldb: Add configure options for packages | 4 | Subject: [PATCH 1/1] ldb: Add configure options for packages |
5 | 5 | ||
6 | Add configure options for the following packages: | 6 | Add configure options for the following packages: |
7 | - acl | 7 | - acl |
@@ -16,9 +16,9 @@ Upstream-Status: Inappropriate [oe deterministic build specific] | |||
16 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 16 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
17 | --- | 17 | --- |
18 | lib/replace/system/wscript_configure | 6 ++- | 18 | lib/replace/system/wscript_configure | 6 ++- |
19 | lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- | 19 | lib/replace/wscript | 94 +++++++++++++++++++++++++++--------- |
20 | wscript | 7 +++ | 20 | wscript | 7 +++ |
21 | 3 files changed, 80 insertions(+), 18 deletions(-) | 21 | 3 files changed, 83 insertions(+), 24 deletions(-) |
22 | 22 | ||
23 | diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure | 23 | diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure |
24 | index 2035474..10f9ae7 100644 | 24 | index 2035474..10f9ae7 100644 |
@@ -37,7 +37,7 @@ index 2035474..10f9ae7 100644 | |||
37 | 37 | ||
38 | # solaris varients of getXXent_r | 38 | # solaris varients of getXXent_r |
39 | diff --git a/lib/replace/wscript b/lib/replace/wscript | 39 | diff --git a/lib/replace/wscript b/lib/replace/wscript |
40 | index 145300d..8218fa5 100644 | 40 | index 2f94d49..68b2d3a 100644 |
41 | --- a/lib/replace/wscript | 41 | --- a/lib/replace/wscript |
42 | +++ b/lib/replace/wscript | 42 | +++ b/lib/replace/wscript |
43 | @@ -23,6 +23,41 @@ def set_options(opt): | 43 | @@ -23,6 +23,41 @@ def set_options(opt): |
@@ -124,18 +124,23 @@ index 145300d..8218fa5 100644 | |||
124 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') | 124 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') |
125 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') | 125 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') |
126 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') | 126 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') |
127 | @@ -248,17 +298,18 @@ def configure(conf): | 127 | @@ -266,22 +316,20 @@ def configure(conf): |
128 | 128 | ||
129 | conf.CHECK_FUNCS('prctl dirname basename') | 129 | conf.CHECK_FUNCS('prctl dirname basename') |
130 | 130 | ||
131 | - strlcpy_in_bsd = False | ||
132 | - | ||
131 | - # libbsd on some platforms provides strlcpy and strlcat | 133 | - # libbsd on some platforms provides strlcpy and strlcat |
132 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): | 134 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): |
133 | - conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | 135 | - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', |
134 | - checklibc=True) | 136 | - checklibc=True): |
137 | - strlcpy_in_bsd = True | ||
135 | - if not conf.CHECK_FUNCS('getpeereid'): | 138 | - if not conf.CHECK_FUNCS('getpeereid'): |
136 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 139 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') |
137 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 140 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): |
138 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | 141 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') |
142 | - if not conf.CHECK_FUNCS('setproctitle_init'): | ||
143 | - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
139 | - | 144 | - |
140 | - if not conf.CHECK_FUNCS('closefrom'): | 145 | - if not conf.CHECK_FUNCS('closefrom'): |
141 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 146 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') |
@@ -148,17 +153,28 @@ index 145300d..8218fa5 100644 | |||
148 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 153 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') |
149 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 154 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): |
150 | + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | 155 | + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') |
156 | + if not conf.CHECK_FUNCS('setproctitle_init'): | ||
157 | + conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
151 | + | 158 | + |
152 | + if not conf.CHECK_FUNCS('closefrom'): | 159 | + if not conf.CHECK_FUNCS('closefrom'): |
153 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 160 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') |
154 | 161 | ||
155 | conf.CHECK_CODE(''' | 162 | conf.CHECK_CODE(''' |
156 | struct ucred cred; | 163 | struct ucred cred; |
164 | @@ -632,7 +680,7 @@ removeea setea | ||
165 | # look for a method of finding the list of network interfaces | ||
166 | for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: | ||
167 | bsd_for_strlcpy = '' | ||
168 | - if strlcpy_in_bsd: | ||
169 | + if Options.options.enable_libbsd: | ||
170 | bsd_for_strlcpy = ' bsd' | ||
171 | if conf.CHECK_CODE(''' | ||
172 | #define %s 1 | ||
157 | diff --git a/wscript b/wscript | 173 | diff --git a/wscript b/wscript |
158 | index 2af8571..059408b 100755 | 174 | index 8ae5be3..a178cc4 100644 |
159 | --- a/wscript | 175 | --- a/wscript |
160 | +++ b/wscript | 176 | +++ b/wscript |
161 | @@ -29,6 +29,13 @@ def set_options(opt): | 177 | @@ -31,6 +31,13 @@ def set_options(opt): |
162 | opt.RECURSE('lib/replace') | 178 | opt.RECURSE('lib/replace') |
163 | opt.tool_options('python') # options for disabling pyc or pyo compilation | 179 | opt.tool_options('python') # options for disabling pyc or pyo compilation |
164 | 180 | ||
@@ -173,5 +189,5 @@ index 2af8571..059408b 100755 | |||
173 | conf.RECURSE('lib/tdb') | 189 | conf.RECURSE('lib/tdb') |
174 | conf.RECURSE('lib/tevent') | 190 | conf.RECURSE('lib/tevent') |
175 | -- | 191 | -- |
176 | 2.8.3 | 192 | 2.16.2 |
177 | 193 | ||
diff --git a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb b/meta-networking/recipes-support/libldb/libldb_1.3.1.bb index cb9ea9283..7e14cde35 100644 --- a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb +++ b/meta-networking/recipes-support/libldb/libldb_1.3.1.bb | |||
@@ -8,7 +8,7 @@ RDEPENDS_pyldb += "python" | |||
8 | 8 | ||
9 | SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ | 9 | SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ |
10 | file://do-not-import-target-module-while-cross-compile.patch \ | 10 | file://do-not-import-target-module-while-cross-compile.patch \ |
11 | file://ldb-Add-configure-options-for-packages.patch \ | 11 | file://options-1.3.1.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | PACKAGECONFIG ??= "\ | 14 | PACKAGECONFIG ??= "\ |
@@ -29,8 +29,8 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada | |||
29 | file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ | 29 | file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ |
30 | file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" | 30 | file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" |
31 | 31 | ||
32 | SRC_URI[md5sum] = "91284a12423def99a6592e393e3b7fbb" | 32 | SRC_URI[md5sum] = "e5233f202bca27f6ce8474fb8ae65983" |
33 | SRC_URI[sha256sum] = "0cedeadb75de401c9735127f654dbc1a391c4327a2b83be54078be286fed1113" | 33 | SRC_URI[sha256sum] = "b19f2c9f55ae0f46aa5ebaea0bf1a47ec1ac135e1d78af0f6318cf50bf62cbd2" |
34 | 34 | ||
35 | inherit waf-samba | 35 | inherit waf-samba |
36 | 36 | ||