Skip to content
Snippets Groups Projects
Commit cbdb82ae authored by Dima Panov's avatar Dima Panov
Browse files

devel/cmake-core: drop dependency on some external libs to avoid a loop cycle (+)

Switch to bundled libcurl+libnghttp2 to utilize fetch ability for cmake
Always use system libarchive/zlib

Discussed with:	tcberner
parent 7bdeb441
No related branches found
No related tags found
No related merge requests found
PORTNAME= cmake
# Remember to update devel/cmake-doc and devel/cmake-gui as well.
DISTVERSION= ${_CMAKE_VERSION}
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
https://www.cmake.org/files/v${PORTVERSION}/
PKGNAMESUFFIX= -core
MAINTAINER= kde@FreeBSD.org
......@@ -13,8 +12,7 @@ WWW= https://www.cmake.org/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/Copyright.txt
LIB_DEPENDS= libcurl.so:ftp/curl \
libexpat.so:textproc/expat2 \
LIB_DEPENDS= libexpat.so:textproc/expat2 \
libjsoncpp.so:devel/jsoncpp \
libuv.so:devel/libuv \
librhash.so:security/rhash
......@@ -27,7 +25,17 @@ CONFIGURE_ENV= MAKE=make
CONFIGURE_ARGS= --prefix=${PREFIX} \
--datadir="/${DATADIR_REL}" \
--docdir="/${DOCSDIR_REL}" \
--system-libs \
--system-expat \
--system-jsoncpp \
--system-zlib \
--system-zstd \
--system-bzip2 \
--system-liblzma \
--system-libarchive \
--system-librhash \
--system-libuv \
--no-system-curl \
--no-system-nghttp2 \
--parallel=${MAKE_JOBS_NUMBER} \
--init="${WRKSRC}/InitialCache.cmake"
......@@ -36,7 +44,7 @@ OPTIONS_SUB= yes
CPACK_DESC= Enable FreeBSD generator in CPack (experimental)
CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN}
CPACK_USES_OFF= libarchive
# CPACK_USES_OFF= libarchive
# When CPACK is on, uses base libarchive and won't pass stage-qa
CXXFLAGS+= -D__BSD_VISIBLE
......
--- Utilities/cmcurl/lib/url.c.orig 2022-08-04 13:53:57 UTC
+++ Utilities/cmcurl/lib/url.c
@@ -626,6 +626,10 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
CURL_HTTP_VERSION_1_1
#endif
;
+#if defined(__FreeBSD_version)
+ /* different handling of signals and threads */
+ set->no_signal = TRUE;
+#endif
Curl_http2_init_userset(set);
return result;
}
......@@ -3091,6 +3091,8 @@ share/bash-completion/completions/ctest
%%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx
%%DATADIR%%/include/cmCPluginAPI.h
%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
%%PORTDOCS%%%%DOCSDIR%%/cmcurl/COPYING
%%PORTDOCS%%%%DOCSDIR%%/cmnghttp2/COPYING
%%PORTDOCS%%%%DOCSDIR%%/cmsys/Copyright.txt
share/emacs/site-lisp/cmake-mode.el
share/vim/vimfiles/indent/cmake.vim
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment