0001-libreplace-disable-libbsd-support.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From fc0304ba92ec7ae9a2f75fbc31d97fee39d19665 Mon Sep 17 00:00:00 2001
  2. From: Gustavo Zacarias <gustavo@zacarias.com.ar>
  3. Date: Wed, 7 Sep 2016 23:03:43 -0300
  4. Subject: [PATCH] libreplace: disable libbsd support
  5. Disable libbsd support, samba4 uses a global config.h for its own
  6. codebase and that of heimdal (when building with builtin).
  7. This causes redefinition conflicts for link(2) when both standard
  8. unistd.h and bsd/unistd.h get included.
  9. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  10. ---
  11. lib/replace/wscript | 12 ------------
  12. 1 file changed, 12 deletions(-)
  13. diff --git a/lib/replace/wscript b/lib/replace/wscript
  14. index 1dfd902..456be9b 100644
  15. --- a/lib/replace/wscript
  16. +++ b/lib/replace/wscript
  17. @@ -248,18 +248,6 @@ def configure(conf):
  18. conf.CHECK_FUNCS('prctl dirname basename')
  19. - # libbsd on some platforms provides strlcpy and strlcat
  20. - if not conf.CHECK_FUNCS('strlcpy strlcat'):
  21. - conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
  22. - checklibc=True)
  23. - if not conf.CHECK_FUNCS('getpeereid'):
  24. - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
  25. - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
  26. - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
  27. -
  28. - if not conf.CHECK_FUNCS('closefrom'):
  29. - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
  30. -
  31. conf.CHECK_CODE('''
  32. struct ucred cred;
  33. socklen_t cred_len;
  34. --
  35. 2.7.3