Date: Sat, 22 Aug 2015 21:58:13 +0000 (UTC) From: Veniamin Gvozdikov <vg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395052 - in head/databases/tarantool: . files Message-ID: <201508222158.t7MLwDjX034042@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vg Date: Sat Aug 22 21:58:12 2015 New Revision: 395052 URL: https://svnweb.freebsd.org/changeset/ports/395052 Log: - Fix build with GCC 4.8 - Fix build on FreeBSD 9.X - Fix build on i386 Added: head/databases/tarantool/files/extra-patch-src_trivia_config.h.cmake (contents, props changed) head/databases/tarantool/files/patch-cmake_compiler.cmake (contents, props changed) Modified: head/databases/tarantool/Makefile Modified: head/databases/tarantool/Makefile ============================================================================== --- head/databases/tarantool/Makefile Sat Aug 22 21:48:25 2015 (r395051) +++ head/databases/tarantool/Makefile Sat Aug 22 21:58:12 2015 (r395052) @@ -3,7 +3,7 @@ PORTNAME= tarantool PORTVERSION= 1.6.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://tarantool.org/dist/master/ DISTNAME= ${PORTNAME}-${PORTVERSION}-${TR_REV}-src @@ -16,7 +16,7 @@ LICENSE= BSD2CLAUSE TR_REV= 238-g74f3d65 MAKE_JOBS_UNSAFE=yes USES= cmake compiler:c++11-lang gettext gmake perl5 readline -USE_GCC= 4.9+ # clang bug PR/201270 +USE_GCC= 4.8+ # clang bug PR/201270 USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message @@ -48,6 +48,10 @@ PLIST_SUB+= TT_USER=${USERS} \ OPTIONS_DEFINE= DEBUG DEBUG_DESC= Enable debug +.if defined(USE_GCC) && ${USE_GCC:S/+//} == 4.8 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_trivia_config.h.cmake +.endif + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDEBUG} @@ -58,10 +62,6 @@ CMAKE_BUILD_TYPE= Rel CMAKE_ARGS+= -DENABLE_BACKTRACE=OFF .endif -.if ${OSVERSION} < 1000000 -IGNORE= does not support FreeBSD versions < 10.0 -.endif - post-install: ${MKDIR} ${STAGEDIR}${TT_LOGDIR} \ ${STAGEDIR}${TT_DATADIR} \ Added: head/databases/tarantool/files/extra-patch-src_trivia_config.h.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/extra-patch-src_trivia_config.h.cmake Sat Aug 22 21:58:12 2015 (r395052) @@ -0,0 +1,16 @@ +--- src/trivia/config.h.cmake.orig 2015-05-15 14:01:37 UTC ++++ src/trivia/config.h.cmake +@@ -21,6 +21,13 @@ + #cmakedefine TARGET_OS_LINUX 1 + /* Defined if building for FreeBSD */ + #cmakedefine TARGET_OS_FREEBSD 1 ++#if defined(TARGET_OS_FREEBSD) ++/* ++ * Fix build with GCC 4.8 when _ThreadRuneLocale undeclared ++ * on FreeBSD. ++ */ ++#define __RUNETYPE_INTERNAL ++#endif + /* Defined if building for Darwin */ + #cmakedefine TARGET_OS_DARWIN 1 + /* Added: head/databases/tarantool/files/patch-cmake_compiler.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/patch-cmake_compiler.cmake Sat Aug 22 21:58:12 2015 (r395052) @@ -0,0 +1,13 @@ +--- cmake/compiler.cmake.orig 2015-08-22 18:47:17 UTC ++++ cmake/compiler.cmake +@@ -129,6 +129,10 @@ macro(enable_tnt_compile_flags) + if (CMAKE_COMPILER_IS_GNUCC) + # A workaround for Redhat Developer Toolset 2.x on RHEL/CentOS 5.x + add_compile_flags("C" "-fno-gnu89-inline") ++ if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) ++ add_compile_flags("C;CXX" ++ "-march=i686") ++ endif() + endif() + + add_definitions("-D__STDC_FORMAT_MACROS=1")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508222158.t7MLwDjX034042>