Date: Mon, 5 Nov 2018 20:05:42 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484214 - in head/devel/yaml-cpp03: . files Message-ID: <201811052005.wA5K5gWi097906@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Mon Nov 5 20:05:42 2018 New Revision: 484214 URL: https://svnweb.freebsd.org/changeset/ports/484214 Log: Generated build.ninja is wrong on powerpc64. Replace $(MAKE) with "make" in CMakeLists.txt. PR: 232563 Submitted by: Piotr Kubaj Approved by: portmgr (tier-2 blanket) Modified: head/devel/yaml-cpp03/Makefile head/devel/yaml-cpp03/files/patch-CMakeLists.txt Modified: head/devel/yaml-cpp03/Makefile ============================================================================== --- head/devel/yaml-cpp03/Makefile Mon Nov 5 19:58:46 2018 (r484213) +++ head/devel/yaml-cpp03/Makefile Mon Nov 5 20:05:42 2018 (r484214) @@ -12,8 +12,6 @@ COMMENT= YAML parser and emitter in C++ matching the Y LICENSE= MIT -BROKEN_powerpc64= fails to build: ninja: build.ninja:386: bad $-escape (literal $ must be written as $$) - USES= cmake USE_LDCONFIG= yes CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON -DYAML_CPP_BUILD_TOOLS=0 Modified: head/devel/yaml-cpp03/files/patch-CMakeLists.txt ============================================================================== --- head/devel/yaml-cpp03/files/patch-CMakeLists.txt Mon Nov 5 19:58:46 2018 (r484213) +++ head/devel/yaml-cpp03/files/patch-CMakeLists.txt Mon Nov 5 20:05:42 2018 (r484214) @@ -1,5 +1,19 @@ --- CMakeLists.txt.orig 2013-04-14 03:37:53.000000000 +0400 +++ CMakeLists.txt 2014-09-11 17:37:09.000000000 +0400 +@@ -139,11 +139,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) + # + set(CMAKE_CXX_FLAGS "-Wall ${GCC_EXTRA_OPTIONS} -pedantic -Wno-long-long ${CMAKE_CXX_FLAGS}") + # +- add_custom_target(debuggable $(MAKE) clean ++ add_custom_target(debuggable make clean + COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug ${CMAKE_SOURCE_DIR} + COMMENT "Adjusting settings for debug compilation" + VERBATIM) +- add_custom_target(releasable $(MAKE) clean ++ add_custom_target(releasable make clean + COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ${CMAKE_SOURCE_DIR} + COMMENT "Adjusting settings for release compilation" + VERBATIM) @@ -240,7 +240,7 @@ set_target_properties(yaml-cpp PROPERTIES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811052005.wA5K5gWi097906>