Browse Source

[build] feature consistency between build types

master
Glenn Strauss 4 months ago
parent
commit
1b11cd7aeb
  1. 15
      SConstruct
  2. 2
      configure.ac
  3. 2
      src/CMakeLists.txt
  4. 3
      src/algo_md5.c
  5. 2
      src/config.h.cmake
  6. 2
      src/meson.build

15
SConstruct

@ -407,17 +407,14 @@ if 1:
'chroot',
'clock_gettime',
'copy_file_range',
'dup2',
'epoll_ctl',
'explicit_bzero',
'explicit_memset',
'fork',
'getcwd',
'gethostbyname',
'getloadavg',
'getopt',
'getrlimit',
'getuid',
'gmtime_r',
'inet_aton',
'inet_pton',
'issetugid',
@ -428,13 +425,10 @@ if 1:
'madvise',
'malloc_trim',
'mallopt',
'memcpy',
'mempcpy',
'memset_s',
'memset',
'mkostemp',
'mmap',
'munmap',
'pipe2',
'poll',
'port_create',
@ -450,14 +444,7 @@ if 1:
'signal',
'splice',
'srandom',
'stat',
'strchr',
'strdup',
'strerror',
'strerror_r',
'strftime',
'strstr',
'strtol',
'timegm',
'writev',
])

2
configure.ac

@ -1445,9 +1445,7 @@ AC_CHECK_FUNCS([\
madvise \
malloc_trim \
mallopt \
memcpy \
mempcpy \
memset \
memset_s \
mkostemp \
mmap \

2
src/CMakeLists.txt

@ -181,9 +181,7 @@ check_function_exists(lstat HAVE_LSTAT)
check_function_exists(madvise HAVE_MADVISE)
check_function_exists(malloc_trim HAVE_MALLOC_TRIM)
check_function_exists(mallopt HAVE_MALLOPT)
check_function_exists(memcpy HAVE_MEMCPY)
check_function_exists(mempcpy HAVE_MEMPCPY)
check_function_exists(memset HAVE_MEMSET)
check_function_exists(mkostemp HAVE_MKOSTEMP)
check_function_exists(mmap HAVE_MMAP)
check_function_exists(pipe2 HAVE_PIPE2)

3
src/algo_md5.c

@ -3,6 +3,9 @@
#include "sys-crypto-md.h"
#ifndef USE_LIB_CRYPTO_MD5
#define HAVE_MEMCPY
#define HAVE_MEMSET
/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
*/

2
src/config.h.cmake

@ -170,9 +170,7 @@
#cmakedefine HAVE_MADVISE
#cmakedefine HAVE_MALLOC_TRIM
#cmakedefine HAVE_MALLOPT
#cmakedefine HAVE_MEMCPY
#cmakedefine HAVE_MEMPCPY
#cmakedefine HAVE_MEMSET
#cmakedefine HAVE_MKOSTEMP
#cmakedefine HAVE_MMAP
#cmakedefine HAVE_PIPE2

2
src/meson.build

@ -144,9 +144,7 @@ conf_data.set('HAVE_LSTAT', compiler.has_function('lstat', args: defs))
conf_data.set('HAVE_MADVISE', compiler.has_function('madvise', args: defs))
conf_data.set('HAVE_MALLOC_TRIM', compiler.has_function('malloc_trim', args: defs))
conf_data.set('HAVE_MALLOPT', compiler.has_function('mallopt', args: defs))
conf_data.set('HAVE_MEMCPY', compiler.has_function('memcpy', args: defs))
conf_data.set('HAVE_MEMPCPY', compiler.has_function('mempcpy', args: defs, prefix: '#include <string.h>'))
conf_data.set('HAVE_MEMSET', compiler.has_function('memset', args: defs))
conf_data.set('HAVE_MKOSTEMP', compiler.has_function('mkostemp', args: defs))
conf_data.set('HAVE_MMAP', compiler.has_function('mmap', args: defs))
conf_data.set('HAVE_PIPE2', compiler.has_function('pipe2', args: defs))

Loading…
Cancel
Save