RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 09:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7284 from ceph/wip-make-remove-libedit

Browse Source 
makefile: remove libedit from libclient.la

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
Loic Dachary 2016-01-25 13:15:48 +07:00
commit acd4314cf3
7 changed files with 2 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -197,8 +197,6 @@ find_package(libuuid REQUIRED)
find_package(libcurl REQUIRED)
find_package(libedit REQUIRED)
option(USE_CRYPTOPP "Cryptopp is ON" ON)
find_package(cryptopp)
if(CRYPTOPP_FOUND)

1
ceph.spec.in
View File

@ -117,7 +117,6 @@ BuildRequires: hdparm
BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel
BuildRequires: libcurl-devel
BuildRequires: libedit-devel
BuildRequires: libxml2-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libudev-devel

32
cmake/modules/Findlibedit.cmake
View File

@ -1,32 +0,0 @@
# Try to find libedit
# Once done, this will define
#
# LIBEDIT_FOUND - system has Profiler
# LIBEDIT_INCLUDE_DIR - the Profiler include directories
# LIBEDIT_LIBRARIES - link these to use Profiler
if(LIBEDIT_INCLUDE_DIR AND LIBEDIT_LIBRARIES)
set(LIBEDIT_FIND_QUIETLY TRUE)
endif(LIBEDIT_INCLUDE_DIR AND LIBEDIT_LIBRARIES)
INCLUDE(CheckCXXSymbolExists)
# include dir
find_path(LIBEDIT_INCLUDE_DIR histedit.h NO_DEFAULT_PATH PATHS
/usr/include
/opt/local/include
/usr/local/include
)
# finally the library itself
find_library(LIBLIBEDIT NAMES edit)
set(LIBEDIT_LIBRARIES ${LIBLIBEDIT})
# handle the QUIETLY and REQUIRED arguments and set LIBEDIT_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(libedit DEFAULT_MSG LIBEDIT_LIBRARIES LIBEDIT_INCLUDE_DIR)
mark_as_advanced(LIBEDIT_LIBRARIES LIBEDIT_INCLUDE_DIR)

10
configure.ac
View File

@ -720,16 +720,6 @@ if test "x$enable_xio" = x"yes"; then
AC_SUBST(XIO_LIBS)
fi
#
# FreeBSD has it in base.
#
if test x"$freebsd" != x"yes" -a x"$with_radosgw" = x"yes"; then
PKG_CHECK_MODULES([LIBEDIT], [libedit >= 2.11],
[], AC_MSG_FAILURE([No usable version of libedit found.]))
else
LIBEDIT_LIBS="-ledit"
fi
#libatomic-ops? You want it!
AC_ARG_WITH([libatomic-ops],
[AS_HELP_STRING([--without-libatomic-ops],

1
debian/control vendored
View File

@ -31,7 +31,6 @@ Build-Depends: autoconf,
libboost-regex-dev,
libboost-random-dev,
libcurl4-gnutls-dev,
libedit-dev,
libexpat1-dev,
libfcgi-dev,
libfuse-dev,

8
src/CMakeLists.txt
View File

@ -144,8 +144,6 @@ endif()
set(heap_profiler_files ${TCMALLOC_srcs})
add_library(heap_profiler_objs OBJECT ${heap_profiler_files})
set(LIBEDIT_LIBS edit)
# Common infrastructure
configure_file(
${CMAKE_SOURCE_DIR}/src/ceph_ver.h.in.cmake
@ -813,10 +811,6 @@ add_executable(ceph-kvstore-tool tools/ceph_kvstore_tool.cc)
target_link_libraries(ceph-kvstore-tool os global ${UNITTEST_CXX_FLAGS})
install(TARGETS ceph-kvstore-tool DESTINATION bin)
#set(ceph_srcs tools/ceph.cc tools/common.cc)
#add_executable(ceph ${ceph_srcs})
#target_link_libraries(ceph global ${LIBEDIT_LIBS})
set(ceph_conf_srcs
tools/ceph_conf.cc)
add_executable(ceph-conf ${ceph_conf_srcs})
@ -901,7 +895,7 @@ if(WITH_LIBCEPHFS)
client/Trace.cc
client/posix_acl.cc)
add_library(client ${libclient_srcs})
target_link_libraries(client osdc mds ${LIBEDIT_LIBS})
target_link_libraries(client osdc mds)
set(libcephfs_srcs libcephfs.cc)
add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs}
$<TARGET_OBJECTS:cls_references_objs>

2
src/client/Makefile.am
View File

@ -8,7 +8,7 @@ libclient_la_SOURCES = \
client/MetaSession.cc \
client/Trace.cc \
client/posix_acl.cc
libclient_la_LIBADD = $(LIBOSDC) $(LIBEDIT_LIBS)
libclient_la_LIBADD = $(LIBOSDC)
noinst_LTLIBRARIES += libclient.la
noinst_HEADERS += \