Date: Sat, 12 Jan 2019 06:39:42 +0000 (UTC) From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490027 - in head/sysutils/facter: . files Message-ID: <201901120639.x0C6dgnY012251@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: romain Date: Sat Jan 12 06:39:42 2019 New Revision: 490027 URL: https://svnweb.freebsd.org/changeset/ports/490027 Log: Fix build when devel/rapidjson is installed devel/leatherman include an old version of RapidJSON that is not compatible with what devel/rapidjson install. Reorder includes so that the version included with devel/leatherman is found before the one of devel/rapidjson because it is what is wanted. While here, fix `make test`. No need to bump PORTREVISION. PR: 233426 Reported by: vladislav.movchan@gmail.com Added: head/sysutils/facter/files/patch-lib_CMakeLists.txt (contents, props changed) Modified: head/sysutils/facter/Makefile Modified: head/sysutils/facter/Makefile ============================================================================== --- head/sysutils/facter/Makefile Sat Jan 12 05:47:56 2019 (r490026) +++ head/sysutils/facter/Makefile Sat Jan 12 06:39:42 2019 (r490027) @@ -53,7 +53,7 @@ post-install: test: build cd ${WRKSRC}/lib && bundle install --path vendor - cd ${WRKSRC} && ${MAKE_CMD} test + cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} test .include <bsd.port.pre.mk> Added: head/sysutils/facter/files/patch-lib_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/facter/files/patch-lib_CMakeLists.txt Sat Jan 12 06:39:42 2019 (r490027) @@ -0,0 +1,15 @@ +--- lib/CMakeLists.txt.orig 2018-12-17 18:05:06 UTC ++++ lib/CMakeLists.txt +@@ -307,11 +307,11 @@ endif() + # Set include directories + include_directories( + inc ++ ${LEATHERMAN_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIRS} + ${YAMLCPP_INCLUDE_DIRS} + ${CURL_INCLUDE_DIRS} +- ${LEATHERMAN_INCLUDE_DIRS} + ${CPPHOCON_INCLUDE_DIRS} + ) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901120639.x0C6dgnY012251>