[packages/mcrouter] up to 0.1.0

glen glen at pld-linux.org
Wed Jul 29 23:38:03 CEST 2015


commit 12582544e59aca6e4beb18293d5c26128c672a54
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jul 30 00:37:39 2015 +0300

    up to 0.1.0

 boost-context.patch | 11 -----------
 mcrouter.spec       | 20 +++++++-------------
 2 files changed, 7 insertions(+), 24 deletions(-)
---
diff --git a/mcrouter.spec b/mcrouter.spec
index d14cf8d..15a2173 100644
--- a/mcrouter.spec
+++ b/mcrouter.spec
@@ -1,22 +1,17 @@
-# TODO:
-# - compile fails: undefined reference to `jump_fcontext', check boost-context.patch for proper fix
-%define	gitrev	39a7572
 Summary:	Memcached protocol router for scaling memcached deployments
 Name:		mcrouter
-# version from configure.ac
-Version:	1.0
-Release:	0.1
+Version:	0.1.0
+Release:	1
 License:	BSD
 Group:		Daemons
-Source0:	https://github.com/facebook/mcrouter/archive/%{gitrev}/%{name}-%{gitrev}.tar.gz
-# Source0-md5:	f99eb19ccd41169e9570ca2b1d152b8a
-Patch0:		boost-context.patch
+Source0:	https://github.com/facebook/mcrouter/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	5cc3e44ee2ff027e8b4077494222610c
 URL:		https://github.com/facebook/mcrouter
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	boost-devel >= 1.51.0
 BuildRequires:	double-conversion-devel
-BuildRequires:	folly-devel >= 0.31
+BuildRequires:	folly-devel >= 0.41.0
 BuildRequires:	gflags-devel
 BuildRequires:	glog-devel
 BuildRequires:	libcap-devel
@@ -36,9 +31,7 @@ infrastructure at Facebook and Instagram where mcrouter handles almost
 5 billion requests per second at peak.
 
 %prep
-%setup -qc
-mv mcrouter-*/* .
-%patch0 -p1
+%setup -q
 
 %build
 cd mcrouter
@@ -60,4 +53,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc README.md LICENSE PATENTS
 %attr(755,root,root) %{_bindir}/mcrouter
diff --git a/boost-context.patch b/boost-context.patch
deleted file mode 100644
index 2dbea1f..0000000
--- a/boost-context.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mcrouter/mcrouter/m4/ax_boost_context.m4~	2015-04-01 04:20:13.000000000 +0300
-+++ mcrouter/mcrouter/m4/ax_boost_context.m4	2015-04-06 13:47:27.995041619 +0300
-@@ -70,7 +70,7 @@
- 
-       AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-         [[@%:@include <boost/context/all.hpp>]],
--        [[boost::context::fcontext_t* fc = boost::context::make_fcontext(0, 0, 0);]])],
-+        [[boost::context::fcontext_t fc = boost::context::make_fcontext(0, 0, 0);]])],
-         ax_cv_boost_context=yes, ax_cv_boost_context=no)
-         CXXFLAGS=$CXXFLAGS_SAVE
-       AC_LANG_POP([C++])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mcrouter.git/commitdiff/12582544e59aca6e4beb18293d5c26128c672a54



More information about the pld-cvs-commit mailing list