diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-17 22:49:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-17 22:49:47 +0100 |
commit | 30c53e395853f5bfe805a1e429fcf26666eed8f8 (patch) | |
tree | a0670eaf9babda7b83503f7d36806a944bb49752 /net-libs/davix | |
parent | d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (diff) |
gentoo resync : 17.05.2018
Diffstat (limited to 'net-libs/davix')
-rw-r--r-- | net-libs/davix/Manifest | 3 | ||||
-rw-r--r-- | net-libs/davix/davix-0.6.7.ebuild | 1 | ||||
-rw-r--r-- | net-libs/davix/files/davix-0.6.7-uuid.patch | 66 |
3 files changed, 69 insertions, 1 deletions
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest index 8e1ac6d4cba1..3136de218839 100644 --- a/net-libs/davix/Manifest +++ b/net-libs/davix/Manifest @@ -1,4 +1,5 @@ AUX davix-0.6.7-uio.patch 316 BLAKE2B 71bf63feb080a4c34f8b672516d8237149bee9d360c7b0d289ac6b226e65427651a688679ec42cc2bf30304a53211d33b06fdccdda228e90b40e21ed7da48cea SHA512 0874cc8c04118e97c176e901bfeaafa13d3a76ec8589b045845133f3f8633e7b75a007ba10990ac4ee1bfe344294d27265510f64171cecd9110fd0b41d71ada2 +AUX davix-0.6.7-uuid.patch 1868 BLAKE2B 24d94348745db5a6b85acca3d050dd7bf44f5b7eb2c7eded0771f251459bc391e4b8a22ad1ad685918525ff0ef89bd319e562a221530ce70807f2161efdef65d SHA512 683257bf61dca6394e5ab0b375e35ea3e28c85f0e01a308a514f91f1da18aca4c63f57e45db7b3862fd7d9e0f80e7129e518798241bfec1ddefd87affc1bad4e DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0caf63dbe3ba39f58a9b11c330c95cd2d40d60d8f2497355d4cb2f2d7537babfef287a5905f32322363d90 SHA512 5cb830e415a4ab87b7b046fbd8ba615379766f4fa4b886a271b0c248c05968b9a3cb144751b44d5fd62f5e07bdb7610c0505e44f2702147f6f006b49a4b3d8ce -EBUILD davix-0.6.7.ebuild 1452 BLAKE2B d89c94fc7f8b7a02fa038bbeb35c43ea35dbf0c9741c8b9f77de4e1f4ee03800b58a8c3cff0a072cb6fc5aafa76e8bc71da3894ef4d867a4d97ae1b22fcf8ffd SHA512 68778525e8a98b6151aff83778416e8286d2a62d1ae1db7abb9d69442717cba851a74ac2c75a0bf516e9805bab532e3fa7d15505c7aaec5d8c0064d11fdd049a +EBUILD davix-0.6.7.ebuild 1484 BLAKE2B cacdc4cf848fa97be6fc46f6cbfd651f4a0fb3e9b8b9a5c7f4290b9ec813781eda2ccce8da5513d290f8c2b527f9949271e0c009d3093660a97cb395ce58970c SHA512 cee6b67866faaae5330db9f60a17e71298a00cbb80b3e2efb674bb935a63f14f094f8e61c48f3df2d0f7b1b491d684474166a231e8abeee436d30076d5292579 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0 diff --git a/net-libs/davix/davix-0.6.7.ebuild b/net-libs/davix/davix-0.6.7.ebuild index 1e3fe6f79bfd..4ca799254b21 100644 --- a/net-libs/davix/davix-0.6.7.ebuild +++ b/net-libs/davix/davix-0.6.7.ebuild @@ -32,6 +32,7 @@ RDEPEND="${CDEPEND}" PATCHES=( "${FILESDIR}"/${P}-uio.patch + "${FILESDIR}"/${P}-uuid.patch ) REQUIRED_USE="test? ( tools )" diff --git a/net-libs/davix/files/davix-0.6.7-uuid.patch b/net-libs/davix/files/davix-0.6.7-uuid.patch new file mode 100644 index 000000000000..97d56315ca3d --- /dev/null +++ b/net-libs/davix/files/davix-0.6.7-uuid.patch @@ -0,0 +1,66 @@ +--- + 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 + |