Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e40adf1ea | ||
|
|
2bbb3058e3 | ||
|
|
cb4a07f2bf |
5 changed files with 8 additions and 133 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
|||
/uvw-2.10.0_libuv_v1.42.tar.gz
|
||||
/uvw-2.11.0_libuv_v1.43.tar.gz
|
||||
/uvw-2.12.1_libuv_v1.44.tar.gz
|
||||
/uvw-3.*_libuv_v1.*.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (uvw-2.12.1_libuv_v1.44.tar.gz) = edf8aae809cf1428c01225070d2b3e401eecf60ba88913786833fc4ad057565215eb727ca040e4316ddbf1b41fe401bbd956cf17847df23cdf3ccdc97e44dfa6
|
||||
SHA512 (uvw-3.4.0_libuv_v1.48.tar.gz) = dbf03c63b0693263b77b405e8f6bf4c207795be9bd024bbc06484e523b55257add1eab632067a956d03399d91ee389c46312603e7754b152c4caf51b40f6bec4
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
From efefe50cbf7b0069174b8381805ad9cf51a719a5 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Mensik <pemensik@redhat.com>
|
||||
Date: Sat, 21 Aug 2021 20:54:11 +0200
|
||||
Subject: [PATCH] Support dynamic linkage of tests
|
||||
|
||||
If libuv is not fetched, try to find and provide libuv parameters using
|
||||
pkg-config. Makes dynamic linking to shared libuv library from the
|
||||
system.
|
||||
---
|
||||
test/CMakeLists.txt | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index b482523..d071c04 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -44,6 +44,18 @@ endif()
|
||||
function(ADD_UVW_TEST TEST_NAME TEST_SOURCE)
|
||||
add_executable(${TEST_NAME} ${TEST_SOURCE})
|
||||
|
||||
+ if (NOT FETCH_LIBUV)
|
||||
+ find_package(PkgConfig QUIET)
|
||||
+ if (PkgConfig_FOUND)
|
||||
+ pkg_check_modules(LIBUV REQUIRED libuv)
|
||||
+
|
||||
+ target_include_directories(
|
||||
+ ${TEST_NAME}
|
||||
+ PUBLIC ${LIBUV_INCLUDE_DIRS}
|
||||
+ )
|
||||
+ endif(PkgConfig_FOUND)
|
||||
+ endif(NOT FETCH_LIBUV)
|
||||
+
|
||||
target_link_libraries(
|
||||
${TEST_NAME}
|
||||
PRIVATE
|
||||
@@ -52,6 +64,7 @@ function(ADD_UVW_TEST TEST_NAME TEST_SOURCE)
|
||||
$<$<TARGET_EXISTS:uvw::uvw-static>:uvw::uvw-static>
|
||||
$<$<TARGET_EXISTS:uv::uv-shared>:uv::uv-shared>
|
||||
$<$<TARGET_EXISTS:uvw::uvw-shared>:uvw::uvw-shared>
|
||||
+ ${LIBUV_LDFLAGS} ${LIBUV_LIBRARIES}
|
||||
GTest::Main
|
||||
Threads::Threads
|
||||
${LIBRT}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
From b87d9468c3d0d02ff42a6589f50a14bdf9ced2fe Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
||||
Date: Mon, 20 Feb 2023 18:22:25 +0100
|
||||
Subject: [PATCH] Include cstdint where uintX_t is used
|
||||
|
||||
Use namespaced version of stdint.h header, which defines int32_t,
|
||||
uint32_t and similar types.
|
||||
---
|
||||
src/uvw/emitter.h | 1 +
|
||||
src/uvw/thread.h | 1 +
|
||||
src/uvw/timer.h | 1 +
|
||||
src/uvw/type_info.hpp | 1 +
|
||||
src/uvw/util.h | 1 +
|
||||
5 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/uvw/emitter.h b/src/uvw/emitter.h
|
||||
index 0db49b6..2585861 100644
|
||||
--- a/src/uvw/emitter.h
|
||||
+++ b/src/uvw/emitter.h
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <functional>
|
||||
#include <list>
|
||||
#include <memory>
|
||||
diff --git a/src/uvw/thread.h b/src/uvw/thread.h
|
||||
index 6f1c822..c97ac79 100644
|
||||
--- a/src/uvw/thread.h
|
||||
+++ b/src/uvw/thread.h
|
||||
@@ -2,6 +2,7 @@
|
||||
#define UVW_THREAD_INCLUDE_H
|
||||
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <type_traits>
|
||||
diff --git a/src/uvw/timer.h b/src/uvw/timer.h
|
||||
index 0e33446..5aa8916 100644
|
||||
--- a/src/uvw/timer.h
|
||||
+++ b/src/uvw/timer.h
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef UVW_TIMER_INCLUDE_H
|
||||
#define UVW_TIMER_INCLUDE_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <chrono>
|
||||
#include <uv.h>
|
||||
#include "handle.hpp"
|
||||
diff --git a/src/uvw/type_info.hpp b/src/uvw/type_info.hpp
|
||||
index 4acee3a..479e997 100644
|
||||
--- a/src/uvw/type_info.hpp
|
||||
+++ b/src/uvw/type_info.hpp
|
||||
@@ -2,6 +2,7 @@
|
||||
#define UVW_TYPE_INFO_INCLUDE_HPP
|
||||
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <string_view>
|
||||
|
||||
namespace uvw {
|
||||
diff --git a/src/uvw/util.h b/src/uvw/util.h
|
||||
index 72326c2..fd94d3a 100644
|
||||
--- a/src/uvw/util.h
|
||||
+++ b/src/uvw/util.h
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <array>
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
--
|
||||
2.39.1
|
||||
|
||||
14
uvw.spec
14
uvw.spec
|
|
@ -1,5 +1,5 @@
|
|||
%global forgeurl0 https://github.com/skypjack/uvw
|
||||
%global libuv_ver 1.44
|
||||
%global libuv_ver 1.48
|
||||
%global tag0 v%{version}_libuv_v%{libuv_ver}
|
||||
%global distprefix %{nil}
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
%global debug_package %{nil}
|
||||
|
||||
Name: uvw
|
||||
Version: 2.12.1
|
||||
Version: 3.4.0
|
||||
%forgemeta
|
||||
Release: %autorelease
|
||||
Summary: Header-only easy to use libuv C++ wrapper
|
||||
|
|
@ -16,11 +16,6 @@ License: MIT
|
|||
URL: https://github.com/skypjack/uvw
|
||||
Source0: %forgesource
|
||||
|
||||
# https://github.com/skypjack/uvw/pull/253
|
||||
Patch1: uvw-2.10-test-libuv-dynamic.patch
|
||||
# https://github.com/skypjack/uvw/pull/273
|
||||
Patch2: uvw-2.12-stdint.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: libuv-devel >= %{libuv_ver}
|
||||
|
|
@ -76,9 +71,12 @@ echo 'Requires: libuv' >> libuvw-static.pc.in
|
|||
# This check is failing on some platforms
|
||||
sed -e 's|ASSERT_NE(cpuInfo\[0\].speed, decltype(cpuInfo\[0\].speed){0});|// &|' \
|
||||
-i test/uvw/util.cpp
|
||||
# does not pass now in mock for some reason
|
||||
sed -e 's/TEST(Loop, Walk)/TEST(Loop, DISABLED_Walk)/' \
|
||||
-i test/uvw/loop.cpp
|
||||
|
||||
%build
|
||||
%cmake -DFETCH_LIBUV=OFF -DBUILD_TESTING=ON -DBUILD_DOCS=ON -DFIND_GTEST_PACKAGE=ON
|
||||
%cmake -DFIND_LIBUV=ON -DFETCH_LIBUV=OFF -DBUILD_TESTING=ON -DBUILD_DOCS=ON -DFIND_GTEST_PACKAGE=ON
|
||||
%cmake_build
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue