You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

78 lines
3.1 KiB

  1. --- a/lib/crypto/wscript_configure 2018-07-26
  2. +++ b/lib/crypto/wscript_configure 2018-08-27
  3. @@ -2,11 +2,11 @@
  4. import Options
  5. import Utils
  6. -if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h',
  7. - checklibc=True):
  8. - conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h',
  9. - checklibc=True)
  10. - conf.CHECK_FUNCS_IN('MD5Init', 'md', headers='sys/md5.h',
  11. +# if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h',
  12. + # checklibc=True):
  13. +conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h',
  14. + checklibc=True)
  15. +conf.CHECK_FUNCS_IN('MD5Init', 'md', headers='sys/md5.h',
  16. checklibc=True)
  17. conf.CHECK_FUNCS_IN('CC_MD5_Init', '', headers='CommonCrypto/CommonDigest.h',
  18. checklibc=True)
  19. --- a/lib/replace/wscript
  20. +++ b/lib/replace/wscript
  21. @@ -302,22 +302,13 @@ def configure(conf):
  22. conf.CHECK_FUNCS('prctl dirname basename')
  23. - strlcpy_in_bsd = False
  24. -
  25. - # libbsd on some platforms provides strlcpy and strlcat
  26. - if not conf.CHECK_FUNCS('strlcpy strlcat'):
  27. - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
  28. - checklibc=True):
  29. - strlcpy_in_bsd = True
  30. - if not conf.CHECK_FUNCS('getpeereid'):
  31. - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
  32. - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
  33. - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
  34. - if not conf.CHECK_FUNCS('setproctitle_init'):
  35. - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
  36. -
  37. - if not conf.CHECK_FUNCS('closefrom'):
  38. - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
  39. + # Not checking for libbsd
  40. + conf.CHECK_FUNCS('strlcpy strlcat')
  41. + conf.CHECK_FUNCS('getpeereid')
  42. + conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h')
  43. + conf.CHECK_FUNCS('setproctitle_init')
  44. +
  45. + conf.CHECK_FUNCS('closefrom')
  46. conf.CHECK_CODE('''
  47. struct ucred cred;
  48. @@ -667,9 +658,6 @@ removeea setea
  49. # look for a method of finding the list of network interfaces
  50. for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']:
  51. - bsd_for_strlcpy = ''
  52. - if strlcpy_in_bsd:
  53. - bsd_for_strlcpy = ' bsd'
  54. if conf.CHECK_CODE('''
  55. #define %s 1
  56. #define NO_CONFIG_H 1
  57. @@ -682,7 +670,7 @@ removeea setea
  58. #include "test/getifaddrs.c"
  59. ''' % method,
  60. method,
  61. - lib='nsl socket' + bsd_for_strlcpy,
  62. + lib='nsl socket',
  63. addmain=False,
  64. execute=True):
  65. break
  66. @@ -730,7 +718,6 @@ def build(bld):
  67. break
  68. extra_libs = ''
  69. - if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd'
  70. bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC',
  71. REPLACE_HOSTCC_SOURCE,