cmake,make-dist: revert "build gperftools if WITH_STATIC_LIBSTDCXX"

as the higher version of libstdc++ is backward compatible with the lower ones. so there is no need to statically link against C++ libraries. they can always use the libstdc++ ships with the distro. This reverts commit a6c73b6 Signed-off-by: Kefu Chai <[email protected]>
Kioob · Aug 6, 2018 · 4b09b2f · 4b09b2f
1 parent c32c6e2
commit 4b09b2f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 82 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -316,11 +316,7 @@ endif(WITH_LZ4)
 #if allocator is set on command line make sure it matches below strings
 if(ALLOCATOR)
   if(${ALLOCATOR} MATCHES "tcmalloc(_minimal)?")
-    if(GPERFTOOLS_USE_STATIC_LIBS)
-      include(Buildgperftools)
-    else()
-      find_package(gperftools REQUIRED)
-    endif()
+    find_package(gperftools REQUIRED)
     set(HAVE_LIBTCMALLOC ON)
   elseif(${ALLOCATOR} STREQUAL "jemalloc")
     find_package(JeMalloc REQUIRED)
@@ -329,10 +325,8 @@ if(ALLOCATOR)
     message(FATAL_ERROR "Unsupported allocator selected: ${ALLOCATOR}")
   endif()
 else(ALLOCATOR)
-  if(NOT GPERFTOOLS_USE_STATIC_LIBS)
-    find_package(gperftools)
-    set(HAVE_LIBTCMALLOC ${gperftools_FOUND})
-  endif()
+  find_package(gperftools)
+  set(HAVE_LIBTCMALLOC ${gperftools_FOUND})
   if(NOT gperftools_FOUND)
     find_package(JeMalloc)
   endif()

diff --git a/cmake/modules/Buildgperftools.cmake b/cmake/modules/Buildgperftools.cmake
diff --git a/make-dist b/make-dist
@@ -61,28 +61,6 @@ download_boost() {
     rm -rf src/boost
 }
 
-download_gperftools() {
-    version=$1
-    shift
-    sha256=$1
-    shift
-    dname=gperftools-$version
-    fname=$dname.tar.gz
-    url=https://github.com/gperftools/gperftools/releases/download/$dname/$fname
-
-    if ! wget -c --no-verbose -O $fname $url; then
-        echo "Download of $url failed"
-        exit 1
-    elif [ $(sha256sum $fname | awk '{print $1}') != $sha256 ]; then
-        echo "Error: failed to download gperftools: SHA256 mismatch."
-        exit 1
-    fi
-    tar xzf $fname -C src
-    mv src/$dname src/gperftools
-    tar cf ${outfile}.gperftools.tar ${outfile}/src/gperftools
-    rm -rf src/gperftools
-}
-
 _python_autoselect() {
   python_command=
   for interpreter in python2.7 python3 ; do
@@ -157,11 +135,9 @@ download_boost $boost_version 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937
                https://dl.bintray.com/boostorg/release/$boost_version/source \
                https://downloads.sourceforge.net/project/boost/boost/$boost_version \
                https://download.ceph.com/qa
-download_gperftools 2.7 1ee8c8699a0eff6b6a203e59b43330536b22bbcbe6448f54c7091e5efb0763c9
 build_dashboard_frontend
 tar --concatenate -f $outfile.all.tar $outfile.version.tar
 tar --concatenate -f $outfile.all.tar $outfile.boost.tar
-tar --concatenate -f $outfile.all.tar $outfile.gperftools.tar
 tar --concatenate -f $outfile.all.tar $outfile.tar
 tar --concatenate -f $outfile.all.tar dashboard_frontend.tar
 mv $outfile.all.tar $outfile.tar

diff --git a/src/perfglue/CMakeLists.txt b/src/perfglue/CMakeLists.txt
@@ -11,13 +11,7 @@ endif()
 option(WITH_PROFILER "build extra profiler binaries" OFF)
 
 if(WITH_PROFILER)
-  if(GPERFTOOLS_USE_STATIC_LIBS)
-    if(NOT TARGET gperftools::profiler)
-      include(Buildgperftools)
-    endif()
-  else()
-    find_package(gperftools REQUIRED profiler)
-  endif()
+  find_package(gperftools REQUIRED profiler)
   add_library(cpu_profiler STATIC
     cpu_profiler.cc)
   target_link_libraries(cpu_profiler