From f5da15945760d6a914077367b7b865e175746d72 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 19 Jan 2016 21:08:24 +0800 Subject: [PATCH] makefile: remove dependency on libedit turns out we are not using it anymore Signed-off-by: Kefu Chai --- CMakeLists.txt | 2 -- ceph.spec.in | 1 - cmake/modules/Findlibedit.cmake | 32 -------------------------------- configure.ac | 10 ---------- debian/control | 1 - src/CMakeLists.txt | 8 +------- src/client/Makefile.am | 2 +- 7 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 cmake/modules/Findlibedit.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b267745c66..1ea2519a03f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,8 +196,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) diff --git a/ceph.spec.in b/ceph.spec.in index b2175bd643f..68091dc2ed2 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -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 diff --git a/cmake/modules/Findlibedit.cmake b/cmake/modules/Findlibedit.cmake deleted file mode 100644 index 0fab5699dbc..00000000000 --- a/cmake/modules/Findlibedit.cmake +++ /dev/null @@ -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) diff --git a/configure.ac b/configure.ac index b79f6ff3ce7..330424d6015 100644 --- a/configure.ac +++ b/configure.ac @@ -716,16 +716,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], diff --git a/debian/control b/debian/control index e31a1d542af..de628453a10 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,6 @@ Build-Depends: autoconf, libboost-regex-dev, libboost-random-dev, libcurl4-gnutls-dev, - libedit-dev, libexpat1-dev, libfcgi-dev, libfuse-dev, diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 60a299ccf64..0b9a8e49728 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 SHARED ${libcephfs_srcs}) if(${ENABLE_SHARED}) diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 31ca60c935d..fa0dc80f4cf 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -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 += \ -- 2.47.3