diff options
Diffstat (limited to 'package/samba4')
| -rw-r--r-- | package/samba4/Config.in | 1 | ||||
| -rw-r--r-- | package/samba4/samba4-0009-disable-libbsd.patch | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/package/samba4/Config.in b/package/samba4/Config.in index 77a46cd713..7008ba2037 100644 --- a/package/samba4/Config.in +++ b/package/samba4/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_SAMBA4 depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS # talloc python threads depends on !BR2_avr32 # bad toolchain + depends on !BR2_nios2 # binary too large, relocations don't fit select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_POPT select BR2_PACKAGE_PYTHON diff --git a/package/samba4/samba4-0009-disable-libbsd.patch b/package/samba4/samba4-0009-disable-libbsd.patch new file mode 100644 index 0000000000..b29a812012 --- /dev/null +++ b/package/samba4/samba4-0009-disable-libbsd.patch @@ -0,0 +1,26 @@ +Disable libbsd support, samba4 uses a global config.h for its own +codebase and that of heimdal (when building with builtin). +This causes redefinition conflicts for link(2) when both standard unistd.h +and bsd/unistd.h get included. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura samba-4.1.7.orig/lib/replace/wscript samba-4.1.7/lib/replace/wscript +--- samba-4.1.7.orig/lib/replace/wscript 2014-04-17 04:59:14.000000000 -0300 ++++ samba-4.1.7/lib/replace/wscript 2014-05-19 09:17:25.561947774 -0300 +@@ -253,15 +253,6 @@ + conf.CHECK_FUNCS('strtouq strtoll __strtoll strtoq memalign posix_memalign') + conf.CHECK_FUNCS('prctl') + +- # 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 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', 'bsd', headers='sys/types.h bsd/unistd.h'): +- conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h') +- + conf.CHECK_CODE(''' + struct ucred cred; + socklen_t cred_len; |
