[luabind/f18] fix build with boost
Tom Callaway
spot at fedoraproject.org
Mon Jan 14 18:20:26 UTC 2013
commit d0039a855770442f6b34f97ad39f7ece2c9ae607
Author: Tom Callaway <spot at fedoraproject.org>
Date: Mon Jan 14 13:22:48 2013 -0500
fix build with boost
luabind-0.9.1-boost149fix.patch | 56 +++++++++++++++++++++++++++++++++++++++
luabind.spec | 8 +++++-
2 files changed, 63 insertions(+), 1 deletions(-)
---
diff --git a/luabind-0.9.1-boost149fix.patch b/luabind-0.9.1-boost149fix.patch
new file mode 100644
index 0000000..a4f38a5
--- /dev/null
+++ b/luabind-0.9.1-boost149fix.patch
@@ -0,0 +1,56 @@
+diff -up luabind-0.9.1/luabind/detail/call_function.hpp.boost luabind-0.9.1/luabind/detail/call_function.hpp
+--- luabind-0.9.1/luabind/detail/call_function.hpp.boost 2013-01-14 12:56:44.024217074 -0500
++++ luabind-0.9.1/luabind/detail/call_function.hpp 2013-01-14 12:57:18.598223390 -0500
+@@ -323,7 +323,8 @@ namespace luabind
+
+ #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED
+
+-#elif BOOST_PP_ITERATION_FLAGS() == 1
++#else
++#if BOOST_PP_ITERATION_FLAGS() == 1
+
+ #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
+ #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
+@@ -440,4 +441,4 @@ namespace luabind
+
+
+ #endif
+-
++#endif
+diff -up luabind-0.9.1/luabind/detail/call_member.hpp.boost luabind-0.9.1/luabind/detail/call_member.hpp
+--- luabind-0.9.1/luabind/detail/call_member.hpp.boost 2013-01-14 12:59:09.825244981 -0500
++++ luabind-0.9.1/luabind/detail/call_member.hpp 2013-01-14 12:59:34.069252456 -0500
+@@ -316,7 +316,8 @@ namespace luabind
+
+ #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED
+
+-#elif BOOST_PP_ITERATION_FLAGS() == 1
++#else
++#if BOOST_PP_ITERATION_FLAGS() == 1
+
+ #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
+ #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
+@@ -360,4 +361,4 @@ namespace luabind
+ #undef LUABIND_TUPLE_PARAMS
+
+ #endif
+-
++#endif
+diff -up luabind-0.9.1/luabind/wrapper_base.hpp.boost luabind-0.9.1/luabind/wrapper_base.hpp
+--- luabind-0.9.1/luabind/wrapper_base.hpp.boost 2013-01-14 12:59:47.984261884 -0500
++++ luabind-0.9.1/luabind/wrapper_base.hpp 2013-01-14 13:00:05.707268014 -0500
+@@ -89,7 +89,8 @@ namespace luabind
+
+ #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED
+
+-#elif BOOST_PP_ITERATION_FLAGS() == 1
++#else
++#if BOOST_PP_ITERATION_FLAGS() == 1
+
+ #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
+ #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
+@@ -188,3 +189,4 @@ namespace luabind
+ #undef N
+
+ #endif
++#endif
diff --git a/luabind.spec b/luabind.spec
index e385ae2..56f57d5 100644
--- a/luabind.spec
+++ b/luabind.spec
@@ -1,12 +1,14 @@
Name: luabind
Version: 0.9.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A library that helps create bindings between C++ and Lua
Group: System Environment/Libraries
License: MIT
URL: http://www.rasterbar.com/products/luabind.html
Source0: http://download.sourceforge.net/luabind/%{name}-%{version}.tar.gz
BuildRequires: boost-devel, boost-build, lua-devel
+# https://github.com/devurandom/luabind/commit/78509cc0242161116c989a08439ea28386deeca2
+Patch0: luabind-0.9.1-boost149fix.patch
%description
Luabind is a library that helps you create bindings between C++ and Lua. It
@@ -26,6 +28,7 @@ This package contains the development libraries and headers for luabind.
%prep
%setup -q
+%patch0 -p1 -b .boost
sed -i 's|$(prefix)/lib|$(prefix)/%{_lib}|g' Jamroot
# Perms cleanup
@@ -52,6 +55,9 @@ bjam -d2 --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} release
%{_libdir}/*.so
%changelog
+* Mon Jan 14 2013 Tom Callaway <spot at fedoraproject.org> - 0.9.1-5
+- apply fix for FTBFS with boost 1.49.0 (bz 893887)
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list