diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2024-03-06 16:43:10 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-08 10:07:21 -0800 |
commit | 9111c760d9baea4e59db0066eb592bba127b5341 (patch) | |
tree | 77459fa5ff39e46ec46a96010d5d978217890f04 /meta-networking/recipes-support/libtalloc/libtalloc | |
parent | dd82a3ab81b48998decfcf7bab41651d7d1a1ea2 (diff) | |
download | meta-openembedded-9111c760d9baea4e59db0066eb592bba127b5341.tar.gz |
libtalloc: upgrade 2.4.1 -> 2.4.2
0001-talloc-Add-configure-options-for-packages.patch
refreshed for 2.4.2
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/libtalloc/libtalloc')
-rw-r--r-- | meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch index 45d847c85..6c92beb30 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch | |||
@@ -24,13 +24,16 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
24 | Rebase to 2.4.1 | 24 | Rebase to 2.4.1 |
25 | Remove libaio option | 25 | Remove libaio option |
26 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 26 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
27 | |||
28 | Rebase to 2.4.2 | ||
29 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
27 | --- | 30 | --- |
28 | lib/replace/wscript | 78 +++++++++++++++++++++++++++++++++------------ | 31 | lib/replace/wscript | 100 ++++++++++++++++++++++++++++++-------------- |
29 | wscript | 7 +++- | 32 | wscript | 7 +++- |
30 | 2 files changed, 64 insertions(+), 21 deletions(-) | 33 | 2 files changed, 75 insertions(+), 32 deletions(-) |
31 | 34 | ||
32 | diff --git a/lib/replace/wscript b/lib/replace/wscript | 35 | diff --git a/lib/replace/wscript b/lib/replace/wscript |
33 | index 199e636..3593eaf 100644 | 36 | index 77e655b..2fd7dfb 100644 |
34 | --- a/lib/replace/wscript | 37 | --- a/lib/replace/wscript |
35 | +++ b/lib/replace/wscript | 38 | +++ b/lib/replace/wscript |
36 | @@ -25,6 +25,34 @@ def options(opt): | 39 | @@ -25,6 +25,34 @@ def options(opt): |
@@ -112,7 +115,7 @@ index 199e636..3593eaf 100644 | |||
112 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') | 115 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') |
113 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') | 116 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') |
114 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') | 117 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') |
115 | @@ -443,20 +481,20 @@ def configure(conf): | 118 | @@ -443,31 +481,31 @@ def configure(conf): |
116 | 119 | ||
117 | strlcpy_in_bsd = False | 120 | strlcpy_in_bsd = False |
118 | 121 | ||
@@ -121,6 +124,17 @@ index 199e636..3593eaf 100644 | |||
121 | - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | 124 | - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', |
122 | - checklibc=True): | 125 | - checklibc=True): |
123 | - strlcpy_in_bsd = True | 126 | - strlcpy_in_bsd = True |
127 | - elif conf.env.enable_fuzzing: | ||
128 | - # Just to complicate it more, some versions of Honggfuzz have | ||
129 | - # got strlcpy and strlcat in libc, but not in <string.h> | ||
130 | - # (unless it is there coincidentally, on a BSD). Therefore we | ||
131 | - # can't use CHECK_FUNCS alone to decide whether to add the | ||
132 | - # headers to replace.h. | ||
133 | - # | ||
134 | - # As this is only known to happen on a fuzzing compiler, we'll | ||
135 | - # skip the check when not in fuzzing mode. | ||
136 | - conf.CHECK_HEADERS('bsd/string.h') | ||
137 | - | ||
124 | - if not conf.CHECK_FUNCS('getpeereid'): | 138 | - if not conf.CHECK_FUNCS('getpeereid'): |
125 | - 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') |
126 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 140 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): |
@@ -136,6 +150,17 @@ index 199e636..3593eaf 100644 | |||
136 | + if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | 150 | + if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', |
137 | + checklibc=True): | 151 | + checklibc=True): |
138 | + strlcpy_in_bsd = True | 152 | + strlcpy_in_bsd = True |
153 | + elif conf.env.enable_fuzzing: | ||
154 | + # Just to complicate it more, some versions of Honggfuzz have | ||
155 | + # got strlcpy and strlcat in libc, but not in <string.h> | ||
156 | + # (unless it is there coincidentally, on a BSD). Therefore we | ||
157 | + # can't use CHECK_FUNCS alone to decide whether to add the | ||
158 | + # headers to replace.h. | ||
159 | + # | ||
160 | + # As this is only known to happen on a fuzzing compiler, we'll | ||
161 | + # skip the check when not in fuzzing mode. | ||
162 | + conf.CHECK_HEADERS('bsd/string.h') | ||
163 | + | ||
139 | + if not conf.CHECK_FUNCS('getpeereid'): | 164 | + if not conf.CHECK_FUNCS('getpeereid'): |
140 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 165 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') |
141 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 166 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): |
@@ -148,7 +173,7 @@ index 199e636..3593eaf 100644 | |||
148 | conf.CHECK_CODE(''' | 173 | conf.CHECK_CODE(''' |
149 | struct ucred cred; | 174 | struct ucred cred; |
150 | diff --git a/wscript b/wscript | 175 | diff --git a/wscript b/wscript |
151 | index 075f1ec..6b4f273 100644 | 176 | index 8b5e02d..b6e2614 100644 |
152 | --- a/wscript | 177 | --- a/wscript |
153 | +++ b/wscript | 178 | +++ b/wscript |
154 | @@ -31,7 +31,12 @@ def options(opt): | 179 | @@ -31,7 +31,12 @@ def options(opt): |
@@ -166,5 +191,5 @@ index 075f1ec..6b4f273 100644 | |||
166 | def configure(conf): | 191 | def configure(conf): |
167 | conf.RECURSE('lib/replace') | 192 | conf.RECURSE('lib/replace') |
168 | -- | 193 | -- |
169 | 2.25.1 | 194 | 2.34.1 |
170 | 195 | ||