Date: Tue, 17 Sep 2013 13:27:06 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327479 - in head/games: allacrost allacrost/files valyriatear Message-ID: <201309171327.r8HDR6DQ048375@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Sep 17 13:27:06 2013 New Revision: 327479 URL: http://svnweb.freebsd.org/changeset/ports/327479 Log: Fix build with clang/libc++ Added: head/games/allacrost/files/patch-src-luabind-luabind-detail-call__function.hpp (contents, props changed) head/games/allacrost/files/patch-src-luabind-luabind-detail-call__member.hpp (contents, props changed) head/games/allacrost/files/patch-src-luabind-luabind-detail-get__signature.hpp (contents, props changed) head/games/allacrost/files/patch-src-luabind-luabind-wrapper__base.hpp (contents, props changed) Modified: head/games/allacrost/Makefile head/games/allacrost/files/patch-src-utils.cpp head/games/valyriatear/Makefile Modified: head/games/allacrost/Makefile ============================================================================== --- head/games/allacrost/Makefile Tue Sep 17 13:10:00 2013 (r327478) +++ head/games/allacrost/Makefile Tue Sep 17 13:27:06 2013 (r327479) @@ -25,7 +25,7 @@ USE_OPENAL= al USE_LUA= 5.1 USE_SDL= sdl ttf net USE_GL= yes -USE_GCC= 4.2+ +USE_GCC= yes # problems in luabind USES= gettext CONFIGURE_ARGS= --datadir=${DATADIR} Added: head/games/allacrost/files/patch-src-luabind-luabind-detail-call__function.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/allacrost/files/patch-src-luabind-luabind-detail-call__function.hpp Tue Sep 17 13:27:06 2013 (r327479) @@ -0,0 +1,18 @@ +--- src/luabind/luabind/detail/call_function.hpp.orig 2010-01-04 02:08:15.000000000 +0300 ++++ src/luabind/luabind/detail/call_function.hpp 2013-09-17 16:37:59.151519546 +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/games/allacrost/files/patch-src-luabind-luabind-detail-call__member.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/allacrost/files/patch-src-luabind-luabind-detail-call__member.hpp Tue Sep 17 13:27:06 2013 (r327479) @@ -0,0 +1,17 @@ +--- src/luabind/luabind/detail/call_member.hpp.orig 2010-01-04 02:08:15.000000000 +0300 ++++ src/luabind/luabind/detail/call_member.hpp 2013-09-17 06:10:17.991226170 +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 +@@ -361,3 +362,4 @@ + + #endif + ++#endif Added: head/games/allacrost/files/patch-src-luabind-luabind-detail-get__signature.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/allacrost/files/patch-src-luabind-luabind-detail-get__signature.hpp Tue Sep 17 13:27:06 2013 (r327479) @@ -0,0 +1,19 @@ +--- src/luabind/luabind/detail/get_signature.hpp.orig 2010-01-04 02:08:15.000000000 +0300 ++++ src/luabind/luabind/detail/get_signature.hpp 2013-09-17 16:37:38.311587583 +0400 +@@ -160,7 +160,8 @@ + + #endif // LUABIND_GET_SIGNATURE_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + // member functions + template<class T, class C BOOST_PP_COMMA_IF(BOOST_PP_ITERATION()) BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), class A)> +@@ -212,5 +213,6 @@ + } + + #endif ++#endif + + #endif // LUABIND_NO_ERROR_CHECKING Added: head/games/allacrost/files/patch-src-luabind-luabind-wrapper__base.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/allacrost/files/patch-src-luabind-luabind-wrapper__base.hpp Tue Sep 17 13:27:06 2013 (r327479) @@ -0,0 +1,17 @@ +--- ./src/luabind/luabind/wrapper_base.hpp.orig 2010-01-04 02:08:15.000000000 +0300 ++++ ./src/luabind/luabind/wrapper_base.hpp 2013-09-17 06:29:47.072226158 +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 Modified: head/games/allacrost/files/patch-src-utils.cpp ============================================================================== --- head/games/allacrost/files/patch-src-utils.cpp Tue Sep 17 13:10:00 2013 (r327478) +++ head/games/allacrost/files/patch-src-utils.cpp Tue Sep 17 13:27:06 2013 (r327479) @@ -1,6 +1,14 @@ ---- src/utils.cpp.orig 2010-09-02 20:33:23.000000000 +0400 -+++ src/utils.cpp 2010-09-02 20:34:01.000000000 +0400 -@@ -337,7 +337,7 @@ +--- src/utils.cpp.orig 2010-05-17 03:38:35.000000000 +0400 ++++ src/utils.cpp 2013-09-17 03:18:36.343226027 +0400 +@@ -21,6 +21,7 @@ + #else + #include <dirent.h> + #include <sys/types.h> ++ #include <unistd.h> + #include <pwd.h> + #endif + +@@ -337,7 +338,7 @@ } const char *source_char = reinterpret_cast<const char *>(source); @@ -9,7 +17,7 @@ // We are using an iconv API that uses const char* const char *sourceChar = source_char; #else -@@ -369,7 +369,7 @@ +@@ -369,7 +370,7 @@ return false; } Modified: head/games/valyriatear/Makefile ============================================================================== --- head/games/valyriatear/Makefile Tue Sep 17 13:10:00 2013 (r327478) +++ head/games/valyriatear/Makefile Tue Sep 17 13:27:06 2013 (r327479) @@ -27,7 +27,7 @@ USE_SDL= sdl image ttf USE_GL= gl USE_OPENAL= yes USE_LUA= 5.1 -USE_GCC= any # problems in luabind; recheck with next update +USE_GCC= yes # problems in luabind; recheck with next update LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lintl PORTDOCS= *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309171327.r8HDR6DQ048375>