The Samba-Bugzilla – Attachment 13734 Details for
Bug 13087
WARNING: No automated network interface determination due to strerror_r
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for 4.7 cherry-picked from master
0001-replace-Link-to-lbsd-when-building-replace.c-by-hand.patch (text/plain), 2.32 KB, created by
Andrew Bartlett
on 2017-10-28 08:58:04 UTC
(
hide
)
Description:
patch for 4.7 cherry-picked from master
Filename:
MIME Type:
Creator:
Andrew Bartlett
Created:
2017-10-28 08:58:04 UTC
Size:
2.32 KB
patch
obsolete
>From c566dfdbf676bb2a005e74f5904f0578e859ba8c Mon Sep 17 00:00:00 2001 >From: Andrew Bartlett <abartlet@samba.org> >Date: Sat, 14 Oct 2017 22:38:18 +1300 >Subject: [PATCH] replace: Link to -lbsd when building replace.c by hand > >This ensures that we correctly detect HAVE_IFACE_GETIFADDRS >et al, which are based on a "build the source" style test. > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=13087 > >Signed-off-by: Andrew Bartlett <abartlet@samba.org> >Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> >(cherry picked from commit 593dacd274a22583cac4e091a08bf2ded0ae9703) >--- > lib/replace/wscript | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > >diff --git a/lib/replace/wscript b/lib/replace/wscript >index 7c50e1d..7357eea 100644 >--- a/lib/replace/wscript >+++ b/lib/replace/wscript >@@ -251,10 +251,13 @@ def configure(conf): > > conf.CHECK_FUNCS('prctl dirname basename') > >+ strlcpy_in_bsd = False >+ > # libbsd on some platforms provides strlcpy and strlcat > if not conf.CHECK_FUNCS('strlcpy strlcat'): >- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', >- checklibc=True) >+ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', >+ checklibc=True): >+ strlcpy_in_bsd = True > if not conf.CHECK_FUNCS('getpeereid'): > conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') > if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): >@@ -611,6 +614,9 @@ removeea setea > > # look for a method of finding the list of network interfaces > for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: >+ bsd_for_strlcpy = '' >+ if strlcpy_in_bsd: >+ bsd_for_strlcpy = ' bsd' > if conf.CHECK_CODE(''' > #define %s 1 > #define NO_CONFIG_H 1 >@@ -623,7 +629,7 @@ removeea setea > #include "test/getifaddrs.c" > ''' % method, > method, >- lib='nsl socket', >+ lib='nsl socket' + bsd_for_strlcpy, > addmain=False, > execute=True): > break >-- >2.9.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
abartlet
:
review?
(
metze
)
garming
:
review+
Actions:
View
Attachments on
bug 13087
:
13687
| 13734