Browse Source

libtalloc: Patch to avoid linking against libcrypt

android-5
Fredrik Fornwall 8 years ago
parent
commit
59ca138b1d
  1. 2
      packages/libtalloc/build.sh
  2. 30
      packages/libtalloc/lib-replace-wscript.patch

2
packages/libtalloc/build.sh

@ -26,7 +26,7 @@ Checking for WORDS_BIGENDIAN: OK
Checking for C99 vsnprintf: OK
Checking for HAVE_SECURE_MKSTEMP: OK
rpath library support: OK
-Wl,--version-script support: OK
-Wl,--version-script support: FAIL
Checking correct behavior of strtoll: OK
Checking correct behavior of strptime: OK
Checking for HAVE_IFACE_GETIFADDRS: OK

30
packages/libtalloc/lib-replace-wscript.patch

@ -0,0 +1,30 @@
diff -u -r ../talloc-2.1.8/lib/replace/wscript ./lib/replace/wscript
--- ../talloc-2.1.8/lib/replace/wscript 2016-07-28 03:17:50.000000000 -0400
+++ ./lib/replace/wscript 2016-08-14 19:03:30.905455753 -0400
@@ -32,7 +32,7 @@
conf.DEFINE('HAVE_LIBREPLACE', 1)
conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
+ conf.CHECK_HEADERS('linux/types.h locale.h acl/libacl.h compat.h')
conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
@@ -465,8 +465,6 @@
conf.CONFIG_SET('HAVE_PTHREAD_MUTEX_CONSISTENT_NP'))):
conf.DEFINE('HAVE_ROBUST_MUTEXES', 1)
- conf.CHECK_FUNCS_IN('crypt', 'crypt', checklibc=True)
-
conf.CHECK_VARIABLE('rl_event_hook', define='HAVE_DECL_RL_EVENT_HOOK', always=True,
headers='readline.h readline/readline.h readline/history.h')
@@ -698,7 +696,7 @@
# at the moment:
# hide_symbols=bld.BUILTIN_LIBRARY('replace'),
private_library=True,
- deps='crypt dl nsl socket rt attr' + extra_libs)
+ deps='dl nsl socket rt attr' + extra_libs)
bld.SAMBA_SUBSYSTEM('replace-test',
source='''test/testsuite.c test/strptime.c
Loading…
Cancel
Save