Date: Thu, 1 Jan 2015 16:10:49 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375948 - head/www/nghttp2 Message-ID: <201501011610.t01GAn3h006404@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Thu Jan 1 16:10:48 2015 New Revision: 375948 URL: https://svnweb.freebsd.org/changeset/ports/375948 QAT: https://qat.redports.org/buildarchive/r375948/ Log: - Fix OSVERSION and WITH_OPENSSL_PORT check We have 4 cases: 1. OSVERSION >= 1000000 and WITH_OPENSSL_PORT undefined 2. OSVERSION >= 1000000 and WITH_OPENSSL_PORT defined 3. OSVERSION < 1000000 and WITH_OPENSSL_PORT undefined 4. OSVERSION < 1000000 and WITH_OPENSSL_PORT defined nghttp2 builds fine in first 2 cases, and it fails in last 2 cases. The ".elif defined(WITH_OPENSSL_PORT)" in r347801 matches case 2 and 4, therefore users of case 2 are affected. We simplify the check to OSVERSION only since there is no need to check OpenSSL version. Notified by: Beeblebrox <zaphod@berentweb.com> Modified: head/www/nghttp2/Makefile Modified: head/www/nghttp2/Makefile ============================================================================== --- head/www/nghttp2/Makefile Thu Jan 1 16:10:12 2015 (r375947) +++ head/www/nghttp2/Makefile Thu Jan 1 16:10:48 2015 (r375948) @@ -50,9 +50,7 @@ HPACK_LIB_DEPENDS= libjansson.so:${PORTS .include <bsd.port.pre.mk> -.if ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT) -IGNORE= nghttp2 requires OpenSSL 1.0.1+ -.elif defined(WITH_OPENSSL_PORT) +.if ${OSVERSION} < 1000000 BROKEN= Does not build .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501011610.t01GAn3h006404>