View | Details | Raw Unified | Return to bug 232088 | Differences between
and this patch

Collapse All | Expand All

(-)benchmarks/sipp/Makefile (-4 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	sipp
4
PORTNAME=	sipp
5
PORTVERSION=	3.5.1
5
PORTVERSION=	3.5.1
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	benchmarks net
7
CATEGORIES=	benchmarks net
8
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
8
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
9
9
Lines 15-28 Link Here
15
BROKEN_mips=		fails to compile: stat.hpp:307: error: ISO C++ does not support long long
15
BROKEN_mips=		fails to compile: stat.hpp:307: error: ISO C++ does not support long long
16
BROKEN_mips64=		fails to compile: stat.hpp:307: error: ISO C++ does not support long long
16
BROKEN_mips64=		fails to compile: stat.hpp:307: error: ISO C++ does not support long long
17
BROKEN_powerpc64=	fails to compile: stat.hpp:307: error: ISO C++ does not support long long
17
BROKEN_powerpc64=	fails to compile: stat.hpp:307: error: ISO C++ does not support long long
18
BROKEN_SSL=		openssl-devel
19
BROKEN_SSL_REASON_openssl-devel=	configure: error: ssl library missing
20
18
21
BUILD_DEPENDS=	help2man:misc/help2man
19
BUILD_DEPENDS=	help2man:misc/help2man
22
20
23
PLIST_FILES=	bin/sipp man/man1/sipp.1.gz
21
PLIST_FILES=	bin/sipp man/man1/sipp.1.gz
24
22
25
USES=		autoreconf gmake ncurses
23
USES=		autoreconf gmake pkgconfig ncurses
26
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
27
25
28
OPTIONS_DEFINE=	OPENSSL GSL PCAP RTPSTREAM SCTP
26
OPTIONS_DEFINE=	OPENSSL GSL PCAP RTPSTREAM SCTP
(-)benchmarks/sipp/files/patch-configure.ac (+24 lines)
Line 0 Link Here
1
--- configure.ac.orig	2018-10-08 21:17:06 UTC
2
+++ configure.ac
3
@@ -137,14 +137,18 @@ AC_SEARCH_LIBS([shutdown], [socket])
4
 
5
 # Conditional build with OpenSSL
6
 if test "$openssl" = 'yes'; then
7
-    AC_CHECK_HEADERS([openssl/md5.h],,[AC_MSG_ERROR([<openssl/md5.h> header missing])])
8
+# Conditional build with OpenSSL
9
+if test "$openssl" = 'yes'; then
10
     AC_CHECK_HEADERS([openssl/bio.h],,[AC_MSG_ERROR([<openssl/bio.h> header missing])])
11
     AC_CHECK_HEADERS([openssl/err.h],,[AC_MSG_ERROR([<openssl/err.h> header missing])])
12
     AC_CHECK_HEADERS([openssl/rand.h],,[AC_MSG_ERROR([<openssl/rand.h> header missing])])
13
     AC_CHECK_HEADERS([openssl/ssl.h],,[AC_MSG_ERROR([<openssl/ssl.h> header missing])])
14
     AC_CHECK_HEADERS([openssl/x509v3.h],,[AC_MSG_ERROR([<openssl/x509v3.h> header missing])])
15
-    AC_CHECK_LIB([ssl], [SSL_library_init],,[AC_MSG_ERROR([ssl library missing])])
16
-    AC_CHECK_LIB([crypto], [CRYPTO_num_locks],,[AC_MSG_ERROR([crypto library missing])])
17
+    AC_CHECK_LIB([ssl], [SSL_CTX_new],,[AC_MSG_ERROR([ssl library missing])])
18
+    AC_CHECK_LIB([crypto], [CRYPTO_free],,[AC_MSG_ERROR([crypto library missing])])
19
+fi
20
+# For Makefile.am
21
+AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = "yes")
22
 fi
23
 # For Makefile.am
24
 AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = "yes")

Return to bug 232088