svn commit: r328038 - in head/devel/luabind: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Sep 23 20:08:32 UTC 2013
Author: amdmi3
Date: Mon Sep 23 20:08:30 2013
New Revision: 328038
URL: http://svnweb.freebsd.org/changeset/ports/328038
Log:
- Fix build with clang [1]
- Fix build with gcc 4.6+ [2]
- Implement staging support
Obtained from: https://github.com/luabind/luabind/commit/3044a9053ac50977684a75c4af42b2bddb853fad [1]
http://thread.gmane.org/gmane.comp.lib.boost.devel/228802 [2]
Added:
head/devel/luabind/files/
head/devel/luabind/files/patch-luabind-detail-call__function.hpp (contents, props changed)
head/devel/luabind/files/patch-luabind-detail-call__member.hpp (contents, props changed)
head/devel/luabind/files/patch-luabind-detail-format__signature.hpp (contents, props changed)
head/devel/luabind/files/patch-luabind-wrapper__base.hpp (contents, props changed)
Modified:
head/devel/luabind/Makefile
Modified: head/devel/luabind/Makefile
==============================================================================
--- head/devel/luabind/Makefile Mon Sep 23 20:07:18 2013 (r328037)
+++ head/devel/luabind/Makefile Mon Sep 23 20:08:30 2013 (r328038)
@@ -21,9 +21,16 @@ CXXFLAGS+= -fPIC
PORTDOCS= *
+OPTIONS_DEFINE= DOCS
+
+.include <bsd.port.options.mk>
+
+post-patch:
+ @${FIND} ${WRKSRC} -name "*.orig" -delete
+
# If you manage to make boost_build build luabind with correct
-# includes/libraries/compiler/flags, please send a patch
-NO_STAGE= yes
+# includes/libraries/compiler/flags, please send a patch;
+# until then, custom build is used
do-build:
@cd ${WRKSRC}/src && ${ECHO_CMD} *.cpp | \
${XARGS} -n1 -t ${_MAKE_JOBS:C/j/P/} \
@@ -32,12 +39,10 @@ do-build:
cd ${WRKSRC}/src && ${AR} -rcs libluabind.a *.o
do-install:
- ${INSTALL_DATA} ${WRKSRC}/src/libluabind.a ${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/src/libluabind.so ${PREFIX}/lib
- cd ${WRKSRC} && ${COPYTREE_SHARE} luabind ${PREFIX}/include
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/src/libluabind.a ${STAGEDIR}${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKSRC}/src/libluabind.so ${STAGEDIR}${PREFIX}/lib
+ cd ${WRKSRC} && ${COPYTREE_SHARE} luabind ${STAGEDIR}${PREFIX}/include
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Added: head/devel/luabind/files/patch-luabind-detail-call__function.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/luabind/files/patch-luabind-detail-call__function.hpp Mon Sep 23 20:08:30 2013 (r328038)
@@ -0,0 +1,18 @@
+--- luabind/detail/call_function.hpp.orig 2010-08-31 17:24:52.000000000 +0400
++++ luabind/detail/call_function.hpp 2013-09-23 22:18:38.767518606 +0400
+@@ -323,7 +323,8 @@
+
+ #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,5 @@
+
+
+ #endif
++#endif
+
Added: head/devel/luabind/files/patch-luabind-detail-call__member.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/luabind/files/patch-luabind-detail-call__member.hpp Mon Sep 23 20:08:30 2013 (r328038)
@@ -0,0 +1,18 @@
+--- luabind/detail/call_member.hpp.orig 2010-08-31 17:24:52.000000000 +0400
++++ luabind/detail/call_member.hpp 2013-09-23 22:19:01.134520448 +0400
+@@ -316,7 +316,8 @@
+
+ #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,5 @@
+ #undef LUABIND_TUPLE_PARAMS
+
+ #endif
++#endif
+
Added: head/devel/luabind/files/patch-luabind-detail-format__signature.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/luabind/files/patch-luabind-detail-format__signature.hpp Mon Sep 23 20:08:30 2013 (r328038)
@@ -0,0 +1,35 @@
+commit 3044a9053ac50977684a75c4af42b2bddb853fad
+Author: Daniel Wallin <daniel at boostpro.com>
+Date: Mon Oct 11 14:33:23 2010 +0200
+
+ Proper forward declarations for object wrappers. Now builds on clang!
+
+diff --git luabind/detail/format_signature.hpp luabind/detail/format_signature.hpp
+index 56e7963..b447bc9 100644
+--- luabind/detail/format_signature.hpp
++++ luabind/detail/format_signature.hpp
+@@ -13,12 +13,19 @@
+ # include <boost/mpl/next.hpp>
+ # include <boost/mpl/size.hpp>
+
+-namespace luabind {
++namespace luabind { namespace adl
++{
+
+-class object;
+-class argument;
+-template <class Base>
+-struct table;
++ class object;
++ class argument;
++ template <class Base>
++ struct table;
++
++} // namespace adl
++
++using adl::object;
++using adl::argument;
++using adl::table;
+
+ } // namespace luabind
+
Added: head/devel/luabind/files/patch-luabind-wrapper__base.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/luabind/files/patch-luabind-wrapper__base.hpp Mon Sep 23 20:08:30 2013 (r328038)
@@ -0,0 +1,17 @@
+--- luabind/wrapper_base.hpp.orig 2010-08-31 17:24:52.000000000 +0400
++++ luabind/wrapper_base.hpp 2013-09-23 22:18:10.975519864 +0400
+@@ -89,7 +89,8 @@
+
+ #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 @@
+ #undef N
+
+ #endif
++#endif
More information about the svn-ports-all
mailing list