diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-libs/davix/files | |
parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) |
gentoo resync : 13.06.2020
Diffstat (limited to 'net-libs/davix/files')
-rw-r--r-- | net-libs/davix/files/davix-0.6.7-uio.patch | 12 | ||||
-rw-r--r-- | net-libs/davix/files/davix-0.6.7-uuid.patch | 66 |
2 files changed, 0 insertions, 78 deletions
diff --git a/net-libs/davix/files/davix-0.6.7-uio.patch b/net-libs/davix/files/davix-0.6.7-uio.patch deleted file mode 100644 index fc7194d05d3d..000000000000 --- a/net-libs/davix/files/davix-0.6.7-uio.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/deps/libneon/src/ne_socket.c b/deps/libneon/src/ne_socket.c -index affc8d7..b4f8ea1 100644 ---- a/deps/libneon/src/ne_socket.c -+++ b/deps/libneon/src/ne_socket.c -@@ -34,6 +34,7 @@ - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif -+#include <sys/uio.h> - - #ifdef __linux__ - #include <sys/ioctl.h> diff --git a/net-libs/davix/files/davix-0.6.7-uuid.patch b/net-libs/davix/files/davix-0.6.7-uuid.patch deleted file mode 100644 index 97d56315ca3d..000000000000 --- a/net-libs/davix/files/davix-0.6.7-uuid.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- - cmake/modules/Finduuid.cmake | 48 +++++++++++++++++------------------- - 1 file changed, 22 insertions(+), 26 deletions(-) - -diff --git a/cmake/modules/Finduuid.cmake b/cmake/modules/Finduuid.cmake -index 2f97a1f..e2c7d13 100644 ---- a/cmake/modules/Finduuid.cmake -+++ b/cmake/modules/Finduuid.cmake -@@ -1,32 +1,28 @@ --# Try to find uuid --# Once done, this will define --# --# UUID_FOUND - system has uuid --# UUID_INCLUDE_DIRS - uuid include directories --# UUID_LIBRARIES - libraries needed to use uuid -- -+include(CheckCXXSymbolExists) -+include(CheckLibraryExists) - include(FindPackageHandleStandardArgs) - --if(UUID_INCLUDE_DIRS AND UUID_LIBRARIES) -- set(UUID_FIND_QUIETLY TRUE) --else() -- find_path( -- UUID_INCLUDE_DIR -- NAMES uuid.h -- HINTS ${UUID_ROOT_DIR} -- PATH_SUFFIXES include uuid) -- -- find_library( -- UUID_LIBRARY -- NAMES uuid -- HINTS ${UUID_ROOT_DIR} -- PATH_SUFFIXES ${LIBRARY_PATH_PREFIX}) -+if(NOT UUID_INCLUDE_DIR) -+ find_path(UUID_INCLUDE_DIR uuid/uuid.h) -+endif() - -+if(EXISTS UUID_INCLUDE_DIR) - set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR}) -- set(UUID_LIBRARIES ${UUID_LIBRARY}) -- -- find_package_handle_standard_args( -- uuid DEFAULT_MSG UUID_LIBRARY UUID_INCLUDE_DIR) -+ set(CMAKE_REQUIRED_INCLUDES ${UUID_INCLUDE_DIRS}) -+ check_cxx_symbol_exists("uuid_generate_random" "uuid/uuid.h" _uuid_header_only) -+endif() - -- mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY) -+if(NOT _uuid_header_only AND NOT UUID_LIBRARY) -+ check_library_exists("uuid" "uuid_generate_random" "" _have_libuuid) -+ if(_have_libuuid) -+ set(UUID_LIBRARY "uuid") -+ set(UUID_LIBRARIES ${UUID_LIBRARY}) -+ endif() - endif() -+ -+unset(CMAKE_REQUIRED_INCLUDES) -+unset(_uuid_header_only) -+unset(_have_libuuid) -+ -+find_package_handle_standard_args(uuid DEFAULT_MSG UUID_INCLUDE_DIR) -+mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY) --- -2.17.0 - |