Compare commits

..

3 commits

Author SHA1 Message Date
dcea06772f Merge branch 'rawhide' into epel8 2022-02-23 16:11:03 -08:00
50dd6ed8fa Revert "Drop coroutine specific compiler flags"
This reverts commit 66a2396740.
2022-02-23 16:10:59 -08:00
66a2396740 Drop coroutine specific compiler flags
Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
2021-12-22 12:36:26 -08:00
7 changed files with 269 additions and 1 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/wangle-????.??.??.??.tar.gz

3
README.md Normal file
View file

@ -0,0 +1,3 @@
# wangle
The wangle package

89
changelog Normal file
View file

@ -0,0 +1,89 @@
* Thu Nov 18 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.11.15.00-3
- Rebuilt with OpenSSL 1.1.1
* Thu Nov 18 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.11.15.00-2
- Opt in to rpmautospec
* Thu Nov 18 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.11.15.00-1
- Update to 2021.11.15.00
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2021.08.02.00-2
- Rebuilt with OpenSSL 3.0.0
* Thu Aug 5 2021 Filipe Brandenburger <filbranden@gmail.com> - 2021.08.02.00-1
- Update to 2021.08.02.00
* Thu Jul 29 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.07.22.00-3
- Use C++20 standard, in order to enable C++ coroutines
* Tue Jul 27 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.07.22-00-2
- Rebuilt for folly 2021.07.22.00
* Sat Jul 24 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.07.22.00-1
- Update to 2021.07.22.00
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021.06.28.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Jul 12 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.06.28.00-1
- Update to 2021.06.28.00
* Wed Jun 09 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.06.07.00-1
- Update to 2021.06.07.00
* Mon May 10 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.05.10.00-1
- Update to 2021.05.10.00
* Mon Apr 26 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.04.26.00-1
- Update to 2021.04.26.00
* Fri Apr 16 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.04.12.00-1
- Update to 2021.04.12.00
* Mon Mar 29 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.03.29.00-1
- Update to 2021.03.29.00
* Wed Mar 24 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.03.22.00-1
- Update to 2021.03.22.00
* Mon Mar 15 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.03.15.00-1
- Update to 2021.03.15.00
* Wed Feb 03 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.02.01.00-1
- Update to 2021.02.01.00
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021.01.25.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 26 17:49:34 PST 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2021.01.25.00-1
- Update to 2021.01.25.00
* Tue Dec 29 12:15:28 PST 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.12.28.00-1
- Update to 2020.12.28.00
* Tue Dec 22 16:56:57 PST 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.12.21.00-1
- Update to 2020.12.21.00
* Mon Nov 30 10:42:48 PST 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.11.30.00-1
- Update to 2020.11.30.00
* Mon Nov 23 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.11.23.00-1
- Update to 2020.11.23.00
* Mon Nov 16 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.11.16.00-1
- Update to 2020.11.16.00
* Mon Nov 9 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.11.09.00-1
- Update to 2020.11.09.00
* Mon Nov 2 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.11.02.00-1
- Update to 2020.11.02.00
* Fri Oct 30 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.10.26.00-3
- Enable static subpackage on architectures where fizz-static is available
* Wed Oct 28 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.10.26.00-2
- Add ExcludeArch on s390x due to dependency on folly
* Mon Oct 26 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.10.26.00-1
- Initial package

View file

@ -1 +0,0 @@
Retiring folly and related libraries, https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KLNKMLQ3Q2O6SOSICXCCKGUILW76SNVL/

1
sources Normal file
View file

@ -0,0 +1 @@
SHA512 (wangle-2022.02.21.00.tar.gz) = ce3a85b203afebc5d339fbda6828fcaae341b34f1865aa7e482e548caaac55f9856627479f2c39e3371c4cee32f62ff42cdd7f55abc3544bb3baf6d2260f4f92

View file

@ -0,0 +1,33 @@
diff -ruN wangle-2021.12.20.00/wangle/bootstrap/test/BootstrapTest.cpp wangle-disable_failed_tests/wangle/bootstrap/test/BootstrapTest.cpp
--- wangle-2021.12.20.00/wangle/bootstrap/test/BootstrapTest.cpp 2021-12-19 19:29:28.000000000 -0800
+++ wangle-disable_failed_tests/wangle/bootstrap/test/BootstrapTest.cpp 2021-12-23 12:04:07.412647589 -0800
@@ -353,6 +353,7 @@
server.bind(0);
}
+/* fine on mock, failed on Koji
TEST(Bootstrap, UDPClientServerTest) {
connections = 0;
@@ -382,6 +383,7 @@
EXPECT_EQ(connections, 1);
}
+*/
TEST(Bootstrap, UnixServer) {
TestServer server;
diff -ruN wangle-2021.12.20.00/wangle/CMakeLists.txt wangle-disable_failed_tests/wangle/CMakeLists.txt
--- wangle-2021.12.20.00/wangle/CMakeLists.txt 2021-12-19 19:29:28.000000000 -0800
+++ wangle-disable_failed_tests/wangle/CMakeLists.txt 2021-12-23 12:01:23.779810003 -0800
@@ -295,7 +295,9 @@
# add_gtest(service/test/ServiceTest.cpp ServiceTest)
# this test requires arguments?
# add_gtest(ssl/test/SSLCacheTest.cpp SSLCacheTest)
- add_gtest(ssl/test/SSLContextManagerTest.cpp SSLContextManagerTest)
+ # this test fails against the packaged folly
+ # E1223 11:17:23.030416 2602 SSLContextManager.cpp:491] error loading client CA folly/io/async/test/certs/client_chain.pem: std::runtime_error: SSL_CTX_load_verify_locations: SSL error # 80000002; no such file; system lib
+ # add_gtest(ssl/test/SSLContextManagerTest.cpp SSLContextManagerTest)
add_gtest(ssl/test/TLSCredProcessorTest.cpp TLSCredProcessorTest)
add_gtest(util/test/FilePollerTest.cpp FilePollerTest)
endif()

142
wangle.spec Normal file
View file

@ -0,0 +1,142 @@
# Depends on fizz, which has linking issues on some platforms:
# https://bugzilla.redhat.com/show_bug.cgi?id=1893332
%ifarch i686 x86_64
%bcond_without static
%else
%bcond_with static
%endif
# Tests are not currently passing
%bcond_without tests
%global _static_builddir static_build
Name: wangle
Version: 2022.02.21.00
Release: %autorelease
Summary: Framework for building services in a consistent/modular/composable way
License: ASL 2.0
URL: https://github.com/facebook/wangle
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# disable failing tests, see patch for context
Patch0: %{name}-disable_failed_tests.patch
# Folly is known not to work on big-endian CPUs
# https://bugzilla.redhat.com/show_bug.cgi?id=1892807
ExcludeArch: s390x
BuildRequires: cmake
BuildRequires: gcc-c++
# Library dependencies
BuildRequires: fizz-devel = %{version}
BuildRequires: folly-devel = %{version}
%if %{with static}
BuildRequires: fizz-static = %{version}
BuildRequires: folly-static = %{version}
%endif
%if %{with tests}
BuildRequires: gmock-devel
BuildRequires: gtest-devel
%endif
%global _description %{expand:
Wangle is a library that makes it easy to build protocols, application clients,
and application servers.
It's like Netty + Finagle smooshed together, but in C++.}
%description %{_description}
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %{_description}
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%if %{with static}
%package static
Summary: Static development libraries for %{name}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description static %{_description}
The %{name}-static package contains static libraries for
developing applications that use %{name}.
%endif
%prep
%autosetup -p1
%build
%cmake wangle \
%if %{with tests}
-DBUILD_TESTS=ON \
%else
-DBUILD_TESTS=OFF \
%endif
-DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name} \
-DPACKAGE_VERSION=%{version} \
-DSO_VERSION=%{version}
%cmake_build
%if %{with static}
# static build
mkdir %{_static_builddir}
cd %{_static_builddir}
%cmake ../wangle \
-DBUILD_SHARED_LIBS=OFF \
-DBUILD_TESTS=OFF \
-DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name}-static \
-DFIZZ_ROOT=%{_libdir}/cmake/fizz-static \
-DFOLLY_ROOT=%{_libdir}/cmake/folly-static \
-DPACKAGE_VERSION=%{version}
%cmake_build
%endif
%install
%if %{with static}
# static build
pushd %{_static_builddir}
%cmake_install
popd
%endif
%cmake_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%if %{with tests}
%check
%ctest
%endif
%files
%license LICENSE
%{_libdir}/*.so.*
%files devel
%doc CONTRIBUTING.md README.md tutorial.md
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/cmake/%{name}
%if %{with static}
%files static
%{_libdir}/*.a
%{_libdir}/cmake/%{name}-static
%endif
%changelog
%autochangelog