mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

ftp/curl: avoid auto-enabling ZSTD, make explicit option; ensure GSSAPI compilation.

Browse Source 
Since August 2020, curl would auto-enable ZSTD if available while
configuring, this would however not propagate to the LIB_DEPENDS.
Make sure to explicitly control ZSTD by introducing an option that
defaults to off.

While here, also mark BROKEN if GSSAPI_BASE is selected while
krb5 is installed when building.

PR:		250414
Approved by:	sunpoet@ (maintainer timeout, 14d)
This commit is contained in:
Matthias Andree 2020-11-01 20:10:06 +00:00
parent 036f5218ec
commit ac2ab461da
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=553854
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ftp/curl/Makefile
View File

@ -32,7 +32,7 @@ DOCS= FAQ FEATURES INSTALL KNOWN_BUGS MAIL-ETIQUETTE THANKS TODO options-in-ver
SHEBANG_FILES= */*.pl
OPTIONS_DEFINE= ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK NTLM PROXY PSL TLS_SRP
OPTIONS_DEFINE= ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK NTLM PROXY PSL TLS_SRP ZSTD
OPTIONS_GROUP= PROTOCOL
OPTIONS_RADIO= SSL
OPTIONS_SINGLE= GSSAPI RESOLV
@ -136,6 +136,8 @@ THREADED_RESOLVER_CONFIGURE_ENABLE= pthreads threaded-resolver
TLS_SRP_CONFIGURE_ENABLE= tls-srp
WOLFSSL_CONFIGURE_WITH= wolfssl
WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl
ZSTD_CONFIGURE_WITH= zstd
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
.include <bsd.port.pre.mk>
@ -151,6 +153,12 @@ IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS
IGNORE= only supports LDAPS with SSL
.endif
.if ${PORT_OPTIONS:MGSSAPI_BASE} && exists(${LOCALBASE}/lib/libkrb5support.so)
BROKEN= The GSSAPI_BASE option is selected, but you have krb5 installed. \
This is incompatible. In order to build, either select GSSAPI_MIT, \
or temporarily deinstall krb5 to build curl, or build in poudriere
.endif
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /cd docs &&/d' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure