Date: Fri, 14 Apr 2017 03:57:49 +0800 From: Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.org> To: Mathieu Arnold <mat@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r438453 - in head: Mk/Uses www/libwww www/mod_auth_gssapi www/mod_spdy Message-ID: <CAMHz58SvFcrpDagthFSch0JeGT-0RTupuACtvc4U02RjJtQyow@mail.gmail.com> In-Reply-To: <201704131652.v3DGq952033037@repo.freebsd.org> References: <201704131652.v3DGq952033037@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Apr 14, 2017 at 12:52 AM, Mathieu Arnold <mat@freebsd.org> wrote: > Author: mat > Date: Thu Apr 13 16:52:09 2017 > New Revision: 438453 > URL: https://svnweb.freebsd.org/changeset/ports/438453 > > Log: > Add a BROKEN_OPENSSL and IGNORE_OPENSSL, to mark ports that are > BROKEN/IGNORE for specific OpenSSL flavors. > > Convert a few ports as an example. > Hi mat, May I suggest to use BROKEN_SSL/IGNORE_SSL instead since we already use ssl rather than openssl in DEFAULT_VERSIONS and USES. Regards, sunpoet > Sponsored by: Absolight > Differential Revision: https://reviews.freebsd.org/D10340 > > Modified: > head/Mk/Uses/ssl.mk > head/www/libwww/Makefile (contents, props changed) > head/www/mod_auth_gssapi/Makefile (contents, props changed) > head/www/mod_spdy/Makefile (contents, props changed) > > Modified: head/Mk/Uses/ssl.mk > ============================================================ > ================== > --- head/Mk/Uses/ssl.mk Thu Apr 13 16:39:36 2017 (r438452) > +++ head/Mk/Uses/ssl.mk Thu Apr 13 16:52:09 2017 (r438453) > @@ -77,6 +77,26 @@ OPENSSL_PORT= security/${SSL_DEFAULT} > .error You are using an unsupported SSL provider ${SSL_DEFAULT} > . endif > > +. if defined(BROKEN_OPENSSL) && ${BROKEN_OPENSSL:M${SSL_DEFAULT}} > +. if defined(BROKEN_OPENSSL_REASON_${SSL_DEFAULT}) > +BROKEN= ${BROKEN_OPENSSL_REASON_${SSL_DEFAULT}} > +. elif defined(BROKEN_OPENSSL_REASON) > +BROKEN= ${BROKEN_OPENSSL_REASON} > +. else > +BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} > +. endif > +. endif > + > +. if defined(IGNORE_OPENSSL) && ${IGNORE_OPENSSL:M${SSL_DEFAULT}} > +. if defined(IGNORE_OPENSSL_REASON_${SSL_DEFAULT}) > +IGNORE= ${IGNORE_OPENSSL_REASON_${SSL_DEFAULT}} > +. elif defined(IGNORE_OPENSSL_REASON) > +IGNORE= ${IGNORE_OPENSSL_REASON} > +. else > +IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} > +. endif > +. endif > + > OPENSSLDIR?= ${OPENSSLBASE}/openssl > .if defined(_SSL_BUILD_DEP) > BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so. > ${OPENSSL_SHLIBVER}:${OPENSSL_PORT} > > Modified: head/www/libwww/Makefile > ============================================================ > ================== > --- head/www/libwww/Makefile Thu Apr 13 16:39:36 2017 (r438452) > +++ head/www/libwww/Makefile Thu Apr 13 16:52:09 2017 (r438453) > @@ -22,15 +22,11 @@ USES= gmake libtool perl5 ssl tar:tgz > USE_PERL5= build > USE_LDCONFIG= yes > > +BROKEN_OPENSSL= openssl-devel > + > post-install: > ${INSTALL_DATA} ${WRKSRC}/modules/expat/xmlparse/xmlparse.h \ > ${STAGEDIR}${PREFIX}/include/w3c-libwww/ > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so > > -.include <bsd.port.pre.mk> > - > -.if ${SSL_DEFAULT:Mopenssl-devel} > -BROKEN= Does not build with openssl-devel > -.endif > - > -.include <bsd.port.post.mk> > +.include <bsd.port.mk> > > Modified: head/www/mod_auth_gssapi/Makefile > ============================================================ > ================== > --- head/www/mod_auth_gssapi/Makefile Thu Apr 13 16:39:36 2017 > (r438452) > +++ head/www/mod_auth_gssapi/Makefile Thu Apr 13 16:52:09 2017 > (r438453) > @@ -29,11 +29,8 @@ SUB_FILES= ${APMOD_FILE} > APMOD_FILE= 240_${PORTNAME}.conf.sample > PLIST_SUB+= APMOD_FILE=${APMOD_FILE} > > -.include <bsd.port.pre.mk> > - > -.if ${SSL_DEFAULT:Mlibressl*} > -IGNORE= mod_auth_gssapi currently only supports OpenSSL > -.endif > +IGNORE_OPENSSL= libressl libressl-devel > +IGNORE_OPENSSL_REASON= mod_auth_gssapi currently only supports OpenSSL > > do-install: > @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} > @@ -43,4 +40,4 @@ do-install: > ${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} > ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so > > -.include <bsd.port.post.mk> > +.include <bsd.port.mk> > > Modified: head/www/mod_spdy/Makefile > ============================================================ > ================== > --- head/www/mod_spdy/Makefile Thu Apr 13 16:39:36 2017 (r438452) > +++ head/www/mod_spdy/Makefile Thu Apr 13 16:52:09 2017 (r438453) > @@ -82,11 +82,10 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ > LDFLAGS="${LDFLAGS}" > MAKE_ENV+= BUILDTYPE=${BUILDTYPE} > > -.include <bsd.port.pre.mk> > +BROKEN_OPENSSL= libressl libressl-devel > +BROKEN_OPENSSL_REASON= incompatible with LibreSSL, please use > www/apache24 with mod_http2 > > -.if ${SSL_DEFAULT:Mlibressl*} > -IGNORE= ${PORTNAME} is incompatible with LibreSSL, please > use www/apache24 with mod_http2 > -.endif > +.include <bsd.port.pre.mk> > > .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 > CXXFLAGS+= -Wno-unused-local-typedef > _______________________________________________ > svn-ports-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58SvFcrpDagthFSch0JeGT-0RTupuACtvc4U02RjJtQyow>