interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove use of pkg-config to see if libbsd is present. 

Instead check for the library directly.In the process, fix the detection of the declarations and functions in libbsd so they work.
This commit is contained in:
Jim Hague 2019-10-15 18:35:06 +01:00
parent a2d09d2be5
commit 8362a183e8
2 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeLists.txt
View File

@ -42,8 +42,6 @@ project(getdns VERSION ${PACKAGE_VERSION})
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
find_package(PkgConfig)
# Directories
include(GNUInstallDirs)
@ -134,8 +132,14 @@ else()
endif()
# Windows. Uh-oh.
set(extra_libraries "")
if (DEFINED GETDNS_ON_WINDOWS)
set(extra_libraries "ws2_32;crypt32;gdi32;iphlpapi")
list(APPEND extra_libraries
"ws2_32"
"crypt32"
"gdi32"
"iphlpapi"
)
endif()
# Check for include files
@ -283,20 +287,28 @@ if (NOT
(HAVE_STRLCPY AND HAVE_DECL_STRLCPY AND
HAVE_ARC4RANDOM AND HAVE_DECL_ARC4RANDOM AND
HAVE_ARC4RANDOM_UNIFORM AND HAVE_DECL_ARC4RANDOM_UNIFORM))
pkg_check_modules(LIBBSD libbsd)
set(CMAKE_REQUIRED_FLAGS "${LIBBSD_CFLAGS} ${LIBBSD_LDFLAGS}")
set(CMAKE_REQUIRED_INCLUDES ${LIBBSD_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${LIBBSD_LIBRARIES})
find_library(BSD_LIB bsd)
if (BSD_LIB)
list(APPEND extra_libraries "bsd")
set(CMAKE_REQUIRED_LIBRARIES "bsd")
check_symbol_exists(strlcpy bsd/string.h HAVE_DECL_STRLCPY)
check_symbol_exists(arc4random bsd/stdlib.h HAVE_DECL_ARC4RANDOM)
check_symbol_exists(arc4random_uniform bsd/stdlib.h HAVE_DECL_ARC4RANDOM_UNIFORM)
check_include_file(bsd/stdlib.h HAVE_BSD_STDLIB_H)
check_include_file(bsd/string.h HAVE_BSD_STRING_H)
check_function_exists(strlcpy HAVE_STRLCPY)
check_function_exists(arc4random HAVE_ARC4RANDOM)
check_function_exists(arc4random_uniform HAVE_ARC4RANDOM_UNIFORM)
check_symbol_exists(strlcpy "bsd/string.h" HAVE_BSD_DECL_STRLCPY)
set(HAVE_DECL_STRLCPY ${HAVE_BSD_DECL_STRLCPY})
check_symbol_exists(arc4random "bsd/stdlib.h" HAVE_BSD_DECL_ARC4RANDOM)
set(HAVE_DECL_ARC4RANDOM ${HAVE_BSD_DECL_ARC4RANDOM})
check_symbol_exists(arc4random_uniform "bsd/stdlib.h" HAVE_BSD_DECL_ARC4RANDOM_UNIFORM)
set(HAVE_DECL_ARC4RANDOM_UNIFORM ${HAVE_BSD_DECL_ARC4RANDOM_UNIFORM})
# TODO: Make module optional and fallback to compat versions for arc4random.
check_function_exists(strlcpy HAVE_BSD_STRLCPY)
set(HAVE_STRLCPY ${HAVE_BSD_STRLCPY})
check_function_exists(arc4random HAVE_BSD_ARC4RANDOM)
set(HAVE_ARC4RANDOM ${HAVE_BSD_ARC4RANDOM})
check_function_exists(arc4random_uniform HAVE_BSD_ARC4RANDOM_UNIFORM)
set(HAVE_ARC4RANDOM_UNIFORM ${HAVE_BSD_ARC4RANDOM_UNIFORM})
endif()
endif()
# Event loop extension

14
cmake/include/cmakeconfig.h.in
View File

@ -145,9 +145,15 @@
#cmakedefine HAVE_SIGSET_T 1
#cmakedefine HAVE__SIGSET_T 1
#cmakedefine HAVE_BSD_STDLIB_H 1
#cmakedefine HAVE_BSD_STRING_H 1
#cmakedefine HAVE_DECL_STRLCPY 1
#cmakedefine HAVE_DECL_ARC4RANDOM 1
#cmakedefine HAVE_DECL_ARC4RANDOM_UNIFORM 1
#cmakedefine HAVE_BSD_DECL_STRLCPY 1
#cmakedefine HAVE_BSD_DECL_ARC4RANDOM 1
#cmakedefine HAVE_BSD_DECL_ARC4RANDOM_UNIFORM 1
#cmakedefine HAVE_STRLCPY 1
#cmakedefine HAVE_ARC4RANDOM 1
@ -251,6 +257,14 @@ extern "C" {
#include <stddef.h>
#endif
#ifdef HAVE_BSD_STDLIB_H
#include <bsd/stdlib.h>
#endif
#ifdef HAVE_BSD_STRING_H
#include <bsd/string.h>
#endif
#if !defined(HAVE_STRLCPY) || !HAVE_DECL_STRLCPY || !defined(strlcpy)
size_t strlcpy(char *dst, const char *src, size_t siz);
#else