chiark - git - mdw - termux-packages/blob - packages/libtalloc/lib-replace-wscript.patch

   1 diff -u -r ../talloc-2.1.10/lib/replace/wscript ./lib/replace/wscript
   2 --- ../talloc-2.1.10/lib/replace/wscript        2017-07-02 22:22:14.000000000 +0200
   3 +++ ./lib/replace/wscript       2017-07-26 15:06:03.665670124 +0200
   4 @@ -32,7 +32,7 @@
   5      conf.DEFINE('HAVE_LIBREPLACE', 1)
   6      conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
   7
   8 -    conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
   9 +    conf.CHECK_HEADERS('linux/types.h locale.h acl/libacl.h compat.h')
  10      conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
  11      conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
  12      conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
  13 @@ -468,9 +468,6 @@
  14               conf.CONFIG_SET('HAVE_PTHREAD_MUTEX_CONSISTENT_NP'))):
  15              conf.DEFINE('HAVE_ROBUST_MUTEXES', 1)
  16
  17 -    conf.CHECK_FUNCS_IN('crypt', 'crypt', checklibc=True)
  18 -    conf.CHECK_FUNCS_IN('crypt_r', 'crypt', checklibc=True)
  19 -
  20      conf.CHECK_VARIABLE('rl_event_hook', define='HAVE_DECL_RL_EVENT_HOOK', always=True,
  21                          headers='readline.h readline/readline.h readline/history.h')
  22
  23 @@ -685,7 +682,6 @@
  24      REPLACE_SOURCE = REPLACE_HOSTCC_SOURCE
  25      REPLACE_SOURCE += ' cwrap.c'
  26
  27 -    if not bld.CONFIG_SET('HAVE_CRYPT'):         REPLACE_SOURCE += ' crypt.c'
  28      if not bld.CONFIG_SET('HAVE_DLOPEN'):        REPLACE_SOURCE += ' dlfcn.c'
  29      if not bld.CONFIG_SET('HAVE_POLL'):          REPLACE_SOURCE += ' poll.c'
  30
  31 @@ -712,7 +708,7 @@
  32                        # at the moment:
  33                        # hide_symbols=bld.BUILTIN_LIBRARY('replace'),
  34                        private_library=True,
  35 -                      deps='crypt dl nsl socket rt attr' + extra_libs)
  36 +                      deps='dl nsl socket rt attr' + extra_libs)
  37
  38      replace_test_cflags="-Wno-format-zero-length"
  39      if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'):