svn commit: r484277 - in head/benchmarks/sipp: . files

[Babak Farrokhi]

Author: farrokhi
Date: Tue Nov  6 06:02:27 2018
New Revision: 484277
URL: https://svnweb.freebsd.org/changeset/ports/484277

Log:
  benchmarks/sipp: Fix OpenSSL 1.1.x build
  
  PR:		232088
  Submitted by:	Nathan <ndowens at yahoo.com>

Added:
  head/benchmarks/sipp/files/patch-configure.ac   (contents, props changed)
Modified:
  head/benchmarks/sipp/Makefile

Modified: head/benchmarks/sipp/Makefile
==============================================================================
--- head/benchmarks/sipp/Makefile	Tue Nov  6 05:44:42 2018	(r484276)
+++ head/benchmarks/sipp/Makefile	Tue Nov  6 06:02:27 2018	(r484277)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sipp
 PORTVERSION=	3.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	benchmarks net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
 
@@ -15,8 +15,6 @@ LICENSE=	GPLv2
 BROKEN_mips=		fails to compile: stat.hpp:307: error: ISO C++ does not support long long
 BROKEN_mips64=		fails to compile: stat.hpp:307: error: ISO C++ does not support long long
 BROKEN_powerpc64=	fails to compile: stat.hpp:307: error: ISO C++ does not support long long
-BROKEN_SSL=		openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	configure: error: ssl library missing
 
 BUILD_DEPENDS=	help2man:misc/help2man
 

Added: head/benchmarks/sipp/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/sipp/files/patch-configure.ac	Tue Nov  6 06:02:27 2018	(r484277)
@@ -0,0 +1,29 @@
+--- configure.ac.orig	2018-10-08 21:17:06 UTC
++++ configure.ac
+@@ -137,14 +137,15 @@ AC_SEARCH_LIBS([shutdown], [socket])
+ 
+ # Conditional build with OpenSSL
+ if test "$openssl" = 'yes'; then
+-    AC_CHECK_HEADERS([openssl/md5.h],,[AC_MSG_ERROR([<openssl/md5.h> header missing])])
++# Conditional build with OpenSSL
++if test "$openssl" = 'yes'; then
+     AC_CHECK_HEADERS([openssl/bio.h],,[AC_MSG_ERROR([<openssl/bio.h> header missing])])
+     AC_CHECK_HEADERS([openssl/err.h],,[AC_MSG_ERROR([<openssl/err.h> header missing])])
+     AC_CHECK_HEADERS([openssl/rand.h],,[AC_MSG_ERROR([<openssl/rand.h> header missing])])
+     AC_CHECK_HEADERS([openssl/ssl.h],,[AC_MSG_ERROR([<openssl/ssl.h> header missing])])
+     AC_CHECK_HEADERS([openssl/x509v3.h],,[AC_MSG_ERROR([<openssl/x509v3.h> header missing])])
+-    AC_CHECK_LIB([ssl], [SSL_library_init],,[AC_MSG_ERROR([ssl library missing])])
+-    AC_CHECK_LIB([crypto], [CRYPTO_num_locks],,[AC_MSG_ERROR([crypto library missing])])
++    AC_CHECK_LIB([ssl], [SSL_CTX_new],,[AC_MSG_ERROR([ssl library missing])])
++    AC_CHECK_LIB([crypto], [CRYPTO_free],,[AC_MSG_ERROR([crypto library missing])])
+ fi
+ # For Makefile.am
+ AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = "yes")
+@@ -156,6 +157,7 @@ if test "$sctp" = 'yes'; then
+     AC_SEARCH_LIBS([sctp_freepaddrs],[sctp sctpsp],,[AC_MSG_ERROR([SCTP library missing])])
+     AC_SEARCH_LIBS([sctp_bindx],[sctp sctpsp],,[AC_MSG_ERROR([SCTP library missing])])
+     AC_SEARCH_LIBS([sctp_recvmsg],[sctp sctpsp],,[AC_MSG_ERROR([SCTP library missing])])
++fi
+ fi
+ # For Makefile.am
+ AM_CONDITIONAL(HAVE_SCTP, test "$sctp" = "yes")