diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-17 18:00:39 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-17 18:00:39 +0000 |
| commit | 6f8f033ab540dbb4a157fe5f79707e061ba0ff50 (patch) | |
| tree | 4306dbdbc23a11505f7b1c54f69e1855097a29bd | |
| parent | devel/phpunit7: Update to 7.1.3 (diff) | |
Fix stage-qa problems with devel/cmake
Linking to base libarchive is disallowed by stage-qa, so restore
USES=libarchive (to avoid the bundled libarchive and to link to
ports libarchive) and drop the pkg(8) generator for CPack, since
libpkg in turn pulls in base libarchive.
PR: 227372
Approved by: tcberner (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=467620
| -rw-r--r-- | devel/cmake/Makefile | 3 | ||||
| -rw-r--r-- | devel/cmake/files/InitialCache.cmake | 13 |
2 files changed, 4 insertions, 12 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 7d9a27f83e3b..ead9db11dac4 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -4,6 +4,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= 3.11.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ @@ -19,7 +20,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libuv.so:devel/libuv \ librhash.so:security/rhash -USES= compiler:c++11-lang ncurses +USES= compiler:c++11-lang libarchive ncurses HAS_CONFIGURE= yes CONFIGURE_ENV= MAKE=make diff --git a/devel/cmake/files/InitialCache.cmake b/devel/cmake/files/InitialCache.cmake index d63c70479d4d..7d4a742232cc 100644 --- a/devel/cmake/files/InitialCache.cmake +++ b/devel/cmake/files/InitialCache.cmake @@ -15,14 +15,5 @@ set(LIBLZMA_INCLUDE_DIR "/usr/include" CACHE PATH set(LIBLZMA_LIBRARY "/usr/lib/liblzma.so" CACHE PATH "LibLZMA library to link against.") -# Similarly for libarchive -set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH - "Directory where LibArchive headers are located.") -set(LibArchive_LIBRARY "/usr/lib/libthr.so;/usr/lib/libarchive.so" CACHE PATH - "LibArchive library to link against.") - -# Modern FreeBSD systems are assumed to have libpkg installed, -# so enable its use in CPack for the direct generation of FreeBSD -# packages from software (outside of ports, say) that uses CMake. -set(CPACK_ENABLE_FREEBSD_PKG ON CACHE BOOL "Enable pkg(8) generator in CPack") - +# Don't even try +set(CPACK_ENABLE_FREEBSD_PKG OFF CACHE BOOL "Enable pkg(8) generator in CPack") |