Date: Sat, 19 Mar 2016 14:36:54 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411404 - in head/games/vavoom: . files Message-ID: <201603191436.u2JEasrY006840@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Mar 19 14:36:54 2016 New Revision: 411404 URL: https://svnweb.freebsd.org/changeset/ports/411404 Log: Add some patches to properly declare dependencies between targets. The upcoming CMake 3.5.0 ends up generating Makefiles that cause much more problems in parallel builds when the dependencies are not declared correctly. This also allows us to get rid of MAKE_JOBS_UNSAFE. PR: 208033 Added: head/games/vavoom/files/patch-progs_common_CMakeLists.txt (contents, props changed) head/games/vavoom/files/patch-source_CMakeLists.txt (contents, props changed) Modified: head/games/vavoom/Makefile Modified: head/games/vavoom/Makefile ============================================================================== --- head/games/vavoom/Makefile Sat Mar 19 14:26:04 2016 (r411403) +++ head/games/vavoom/Makefile Sat Mar 19 14:36:54 2016 (r411404) @@ -17,8 +17,6 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graph USES= cmake dos2unix jpeg tar:bzip2 DOS2UNIX_REGEX= ((.*\.(c|cpp|h|s|asm|inc|vc|ls|acs|cfg|txt|vs|mak|mgw"))$$|\/(makefile\..*|makefile|Makefile)$$) -MAKE_JOBS_UNSAFE= yes - OPTIONS_DEFINE= FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS OPTIONS_DEFAULT= OPENGL SDL LAUNCHER_DESC= Build GUI launcher Added: head/games/vavoom/files/patch-progs_common_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/vavoom/files/patch-progs_common_CMakeLists.txt Sat Mar 19 14:36:54 2016 (r411404) @@ -0,0 +1,8 @@ +--- progs/common/CMakeLists.txt.orig 2016-03-16 16:45:41 UTC ++++ progs/common/CMakeLists.txt +@@ -17,4 +17,4 @@ add_custom_command(OUTPUT ${OUTDIR}/uiba + COMMAND ${VCC} ARGS -P${OUTDIR} ${CMAKE_CURRENT_SOURCE_DIR}/uibase/classes.vc ${OUTDIR}/uibase.dat + DEPENDS vcc uibase/*.vc ${OUTDIR}/engine.dat) + add_custom_target(uibase ALL DEPENDS ${OUTDIR}/uibase.dat) +-add_dependencies(uibase vcc engine) ++add_dependencies(uibase vcc engine linespec) Added: head/games/vavoom/files/patch-source_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/vavoom/files/patch-source_CMakeLists.txt Sat Mar 19 14:36:54 2016 (r411404) @@ -0,0 +1,20 @@ +--- source/CMakeLists.txt.orig 2016-03-16 16:43:57 UTC ++++ source/CMakeLists.txt +@@ -790,7 +790,7 @@ if (MAIN_COMPILE_FLAGS) + set_target_properties(vavoom PROPERTIES COMPILE_FLAGS ${MAIN_COMPILE_FLAGS}) + endif (MAIN_COMPILE_FLAGS) + target_link_libraries(vavoom ${MAIN_LIBS}) +-add_dependencies(vavoom core timidity glbsp libglvis) ++add_dependencies(vavoom core timidity glbsp libglvis revision_check) + + install(TARGETS vavoom DESTINATION ${BINDIR}) + +@@ -845,7 +845,7 @@ else(ENABLE_WRAPPERS) + endif(ENABLE_WRAPPERS) + set_target_properties(vavoom-dedicated PROPERTIES COMPILE_FLAGS -DSERVER) + target_link_libraries(vavoom-dedicated glbsp core ${ZLIB_LIBRARY} ${NET_LIBRARIES}) +-add_dependencies(vavoom-dedicated core glbsp) ++add_dependencies(vavoom-dedicated core glbsp revision_check) + + install(TARGETS vavoom-dedicated DESTINATION ${BINDIR}) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603191436.u2JEasrY006840>