Date: Tue, 17 Apr 2018 18:00:39 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467620 - in head/devel/cmake: . files Message-ID: <201804171800.w3HI0doZ076352@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Tue Apr 17 18:00:39 2018 New Revision: 467620 URL: https://svnweb.freebsd.org/changeset/ports/467620 Log: 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) Modified: head/devel/cmake/Makefile head/devel/cmake/files/InitialCache.cmake Modified: head/devel/cmake/Makefile ============================================================================== --- head/devel/cmake/Makefile Tue Apr 17 17:19:58 2018 (r467619) +++ head/devel/cmake/Makefile Tue Apr 17 18:00:39 2018 (r467620) @@ -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 Modified: head/devel/cmake/files/InitialCache.cmake ============================================================================== --- head/devel/cmake/files/InitialCache.cmake Tue Apr 17 17:19:58 2018 (r467619) +++ head/devel/cmake/files/InitialCache.cmake Tue Apr 17 18:00:39 2018 (r467620) @@ -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")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804171800.w3HI0doZ076352>