Date: Thu, 27 Nov 2014 18:01:36 +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: r373503 - in head/games/openclonk: . files Message-ID: <201411271801.sARI1awr068296@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Nov 27 18:01:36 2014 New Revision: 373503 URL: https://svnweb.freebsd.org/changeset/ports/373503 QAT: https://qat.redports.org/buildarchive/r373503/ Log: - Fix build on i386 - Mark broken on pre-clang (does not build due to lack of proper c++11 support) Approved by: portmgr blanket Added: head/games/openclonk/files/ head/games/openclonk/files/patch-src__platform__StdSync.h (contents, props changed) Modified: head/games/openclonk/Makefile Modified: head/games/openclonk/Makefile ============================================================================== --- head/games/openclonk/Makefile Thu Nov 27 17:33:10 2014 (r373502) +++ head/games/openclonk/Makefile Thu Nov 27 18:01:36 2014 (r373503) @@ -21,7 +21,7 @@ LIB_DEPENDS= libboost_thread.so:${PORTSD libpng.so:${PORTSDIR}/graphics/png \ libvorbis.so:${PORTSDIR}/audio/libvorbis -USES= cmake iconv pkgconfig tar:bzip2 +USES= compiler:c++11-lib cmake iconv pkgconfig tar:bzip2 USE_GL= glew USE_GNOME= gtk20 USE_SDL= sdl mixer @@ -29,8 +29,14 @@ USE_XORG= x11 xpm WRKSRC= ${WRKDIR}/openclonk-release-${DISTVERSIONPREFIX}${DISTVERSION}-src +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 1000024 +BROKEN= does not build (lack of proper c++11 support) +.endif + post-patch: @${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \ ${WRKSRC}/CMakeLists.txt -.include <bsd.port.mk> +.include <bsd.port.post.mk> Added: head/games/openclonk/files/patch-src__platform__StdSync.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openclonk/files/patch-src__platform__StdSync.h Thu Nov 27 18:01:36 2014 (r373503) @@ -0,0 +1,11 @@ +--- src/platform/StdSync.h.orig 2014-10-05 17:22:07.000000000 +0400 ++++ src/platform/StdSync.h 2014-11-27 18:14:51.000000000 +0300 +@@ -135,7 +135,7 @@ + { + // Use pthread_cond_wait or pthread_cond_timedwait depending on wait length. Check return value. + // Note this will temporarily unlock the mutex, so no deadlock should occur. +- timespec ts = { iMillis / 1000, (iMillis % 1000) * 1000000 }; ++ timespec ts = { static_cast<time_t>(iMillis / 1000), static_cast<long>(iMillis % 1000) * 1000000 }; + if (0 != (iMillis != INFINITE ? pthread_cond_timedwait(&cond, &mutex, &ts) : pthread_cond_wait(&cond, &mutex))) + { + pthread_mutex_unlock(&mutex);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411271801.sARI1awr068296>