From: Sage Weil <sage@redhat.com>
Date: Thu, 29 Oct 2015 05:06:36 +0000 (-0400)
Subject: rgw: link against system openssl (instead of dlopen at runtime)
X-Git-Tag: v10.1.0~283^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa92f9dff0d565228e920a4b793eceff13651b61;p=ceph.git

rgw: link against system openssl (instead of dlopen at runtime)

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 406c4f5ddd8..d385074f78a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -139,6 +139,7 @@ BuildRequires:	libblkid-devel >= 2.17
 BuildRequires:	libudev-devel
 BuildRequires:	libtool
 BuildRequires:	make
+BuildRequires:  openssl-devel
 BuildRequires:	parted
 BuildRequires:	perl
 BuildRequires:	pkgconfig
diff --git a/debian/control b/debian/control
index 3e6751117ea..c30d5766f8b 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Build-Depends: autoconf,
                libleveldb-dev,
                libnss3-dev,
                libsnappy-dev,
+	       libssl-dev,
                liblttng-ust-dev,
                libtool,
                libudev-dev,
diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index a347537eb81..3a80f2c2aaf 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -291,6 +291,7 @@ CEPH_GLOBAL = $(LIBGLOBAL) $(LIBCOMMON) $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXT
 LIBCOMMON_DEPS =
 LIBRADOS_DEPS =
 LIBRGW_DEPS =
+LIBCIVETWEB_DEPS =
 
 # This is used by the dencoder test
 DENCODER_SOURCES =
diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index 9eefc1abbb4..40705a373c4 100644
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -129,7 +129,8 @@ libcivetweb_la_SOURCES =  \
 
 libcivetweb_la_CXXFLAGS = ${CIVETWEB_INCLUDE} -fPIC -Woverloaded-virtual \
 	${AM_CXXFLAGS}
-libcivetweb_la_CFLAGS = -I$(srcdir)/civetweb/include ${CIVETWEB_INCLUDE} -fPIC
+libcivetweb_la_CFLAGS = -I$(srcdir)/civetweb/include ${CIVETWEB_INCLUDE} -fPIC -DNO_SSL_DL
+LIBCIVETWEB_DEPS += -lssl
 
 noinst_LTLIBRARIES += libcivetweb.la
 
@@ -143,7 +144,7 @@ radosgw_SOURCES = \
 	rgw/rgw_main.cc
 
 radosgw_CFLAGS = -I$(srcdir)/civetweb/include -fPIC -I$(srcdir)/xxHash
-radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBRGW_DEPS) $(RESOLV_LIBS) \
+radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBCIVETWEB_DEPS) $(LIBRGW_DEPS) $(RESOLV_LIBS) \
 	$(CEPH_GLOBAL)
 bin_PROGRAMS += radosgw