RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 05:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7825 from ceph/wip-rgw-openssl

Browse Source 
rgw: link civetweb with openssl (Sage, Marcus Watts)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2016-02-27 06:17:15 -08:00
commit 04884be986
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceph.spec.in
View File

@ -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

1
debian/control vendored
View File

@ -41,6 +41,7 @@ Build-Depends: autoconf,
libleveldb-dev,
libnss3-dev,
libsnappy-dev,
libssl-dev,
liblttng-ust-dev,
libtool,
libudev-dev,

16
src/CMakeLists.txt
View File

@ -1195,8 +1195,14 @@ if(${WITH_RADOSGW})
rgw/rgw_xml_enc.cc
)
set(civetweb_common_files civetweb/src/civetweb.c)
add_library(civetweb_common_objs OBJECT ${civetweb_common_files})
target_include_directories(civetweb_common_objs PUBLIC
"${CMAKE_SOURCE_DIR}/src/civetweb/include")
set_property(TARGET civetweb_common_objs
APPEND PROPERTY COMPILE_DEFINITIONS NO_SSL_DL=1)
add_library(rgw_a STATIC ${rgw_a_srcs})
target_include_directories(rgw_a PUBLIC "${CMAKE_SOURCE_DIR}/src/civetweb/include")
target_link_libraries(rgw_a librados cls_rgw_client cls_refcount_client
cls_log_client cls_statelog_client cls_timeindex_client cls_version_client
cls_replica_log_client cls_user_client curl global expat)
@ -1211,7 +1217,6 @@ if(${WITH_RADOSGW})
rgw/rgw_civetweb.cc
rgw/rgw_civetweb_frontend.cc
rgw/rgw_civetweb_log.cc
civetweb/src/civetweb.c
rgw/rgw_main.cc)
set(radosgw_admin_srcs
@ -1251,12 +1256,13 @@ if(${WITH_RADOSGW})
include/rados/rgw_file.h
DESTINATION include/rados)
add_executable(radosgw ${radosgw_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
add_executable(radosgw ${radosgw_srcs} $<TARGET_OBJECTS:civetweb_common_objs>
$<TARGET_OBJECTS:heap_profiler_objs>)
target_link_libraries(radosgw rgw_a librados
cls_rgw_client cls_lock_client cls_refcount_client
cls_log_client cls_statelog_client cls_timeindex_client
cls_version_client cls_replica_log_client cls_user_client
curl expat global fcgi resolv ${BLKID_LIBRARIES} ${ALLOC_LIBS})
curl expat global fcgi resolv ssl crypto ${BLKID_LIBRARIES} ${ALLOC_LIBS})
install(TARGETS radosgw DESTINATION bin)
add_executable(radosgw-admin ${radosgw_admin_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
@ -1264,7 +1270,7 @@ if(${WITH_RADOSGW})
cls_rgw_client cls_lock_client cls_refcount_client
cls_log_client cls_statelog_client cls_timeindex_client
cls_version_client cls_replica_log_client cls_user_client
curl expat global fcgi resolv ${BLKID_LIBRARIES} ${ALLOC_LIBS})
curl expat global fcgi resolv ssl crypto ${BLKID_LIBRARIES} ${ALLOC_LIBS})
install(TARGETS radosgw-admin DESTINATION bin)

1
src/Makefile-env.am
View File

@ -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 =

2
src/civetweb

@ -1 +1 @@
Subproject commit 8d271315a541218caada366f84a2690fdbd474a2
Subproject commit 554fa96229bcb2de08c9e9d976a3153d324126b3

5
src/rgw/Makefile.am
View File

@ -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 -lcrypto
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