From caae86e6f8b8150ad8663c3173fcd6df3c2e260a Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Thu, 5 Nov 2015 19:57:51 +0530 Subject: build: fix ecdh.h and dh.h deps openssl.ecdh.h and openssl/dh.h are not available on all platforms. This patch adds check to autoconf and updates relevant source files. Add missing #include "config.h" to socket.c to make HAVE_OPENSSL_DH_H and HAVE_OPENSSL_ECDH_H macros available. Definitions for UTIME_OMIT and UTIME_NOW in contrib/qemu/util/oslib-posix.c have been selected from /usr/include/bits/stat.h on Fedora 22 SSL context options SSL_OP_NO_TICKET and SSL_OP_NO_COMPRESSION are now conditionally set by testing their presence. glusterfs.spec.in file now adds CFLAGS=-DUSE_INSECURE_OPENSSL for RHEL < 6 in the %build section. Change-Id: Ie32a950dad77bb0f09b4ba53edb3e1f3147056f3 BUG: 1258883 Signed-off-by: Milind Changire Reviewed-on: http://review.gluster.org/12517 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Jeff Darcy --- glusterfs.spec.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 90705b1ae3c..e4d033a335a 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -589,6 +589,11 @@ This package provides the translators needed on any GlusterFS client. %setup -q -n %{name}-%{version}%{?prereltag} %build +%if ( 0%{?rhel} && 0%{?rhel} < 6 ) +CFLAGS=-DUSE_INSECURE_OPENSSL +export CFLAGS +%endif + ./autogen.sh && %configure \ %{?_with_cmocka} \ %{?_with_debug} \ -- cgit