Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Jan 2021 19:34:10 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r562236 - head/www/cpp-httplib
Message-ID:  <202101211934.10LJYALQ088855@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Thu Jan 21 19:34:10 2021
New Revision: 562236
URL: https://svnweb.freebsd.org/changeset/ports/562236

Log:
  www/cpp-httplib: Fix build on 11 by removing the SSL option there
  
  The project requires a higher SSL verion than 11 has.
  
  Reported by:	fallout

Modified:
  head/www/cpp-httplib/Makefile

Modified: head/www/cpp-httplib/Makefile
==============================================================================
--- head/www/cpp-httplib/Makefile	Thu Jan 21 19:27:10 2021	(r562235)
+++ head/www/cpp-httplib/Makefile	Thu Jan 21 19:34:10 2021	(r562236)
@@ -26,14 +26,22 @@ PLIST_FILES=	include/httplib.h \
 		lib/cmake/httplib/httplibConfigVersion.cmake \
 		lib/cmake/httplib/httplibTargets.cmake
 
-OPTIONS_DEFINE=		BROTLI SSL
-OPTIONS_DEFAULT=	BROTLI SSL
+OSVERSION!=	awk '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${CROSS_SYSROOT}/usr/include/sys/param.h # needed for options, so including bsd.port.options.mk is impossible
 
+OPTIONS_DEFINE=		BROTLI
+OPTIONS_DEFAULT=	BROTLI
+.if ${OSVERSION} >= 1200000
+OPTIONS_DEFINE+=	SSL # fails on 11: Found unsuitable version "1.0.2u", but required is at least "1.1.1"
+OPTIONS_DEFAULT+=	SSL
+.endif
+
 BROTLI_CMAKE_BOOL=	HTTPLIB_REQUIRE_BROTLI HTTPLIB_USE_BROTLI_IF_AVAILABLE
 BROTLI_BUILD_DEPENDS=	brotli>0:archivers/brotli
 BROTLI_RUN_DEPENDS=	brotli>0:archivers/brotli
 
+.if ${OSVERSION} >= 1200000
 SSL_USES=		ssl
 SSL_CMAKE_BOOL=		HTTPLIB_REQUIRE_OPENSSL HTTPLIB_USE_OPENSSL_IF_AVAILABLE
+.endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101211934.10LJYALQ088855>