diff options
| author | Romain Tartière <romain@FreeBSD.org> | 2019-01-12 06:39:42 +0000 |
|---|---|---|
| committer | Romain Tartière <romain@FreeBSD.org> | 2019-01-12 06:39:42 +0000 |
| commit | cf17071c37f56b163c5b4cb763b5ef829768d37b (patch) | |
| tree | fbfa65306fa14c29db11b1441490c1124e11311b /sysutils | |
| parent | multimedia/kodi-devel: Update to 18.0rc5 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=490027
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/facter/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/facter/files/patch-lib_CMakeLists.txt | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index 3f0787ced16e..3c77970fffc8 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -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> diff --git a/sysutils/facter/files/patch-lib_CMakeLists.txt b/sysutils/facter/files/patch-lib_CMakeLists.txt new file mode 100644 index 000000000000..5d70274efe12 --- /dev/null +++ b/sysutils/facter/files/patch-lib_CMakeLists.txt @@ -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} + ) + |