[med-svn] [rapmap] 02/05: Do not try downloading libjemalloc

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository rapmap.

commit 66a64966afdc1271cf95fac880647659b202da1a
Author: Andreas Tille <tille at debian.org>
Date:   Mon Dec 5 16:30:43 2016 +0100

    Do not try downloading libjemalloc
---
 debian/changelog                     |  2 ++
 debian/patches/use-debian-libs.patch | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 61a97ad..e05fdad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ rapmap (0.4.0+dfsg-2) UNRELEASED; urgency=medium
 
   * Set NO_NATIVE_ARCH=true
     Closes: #847084
+  * Do not try downloading libjemalloc
+    Closes: #847083
 
  -- Andreas Tille <tille at debian.org>  Mon, 05 Dec 2016 16:27:02 +0100
 
diff --git a/debian/patches/use-debian-libs.patch b/debian/patches/use-debian-libs.patch
index 63ac2f8..28c8643 100644
--- a/debian/patches/use-debian-libs.patch
+++ b/debian/patches/use-debian-libs.patch
@@ -51,6 +51,31 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  
  set (FAST_MALLOC_LIB "")
  set (HAVE_FAST_MALLOC FALSE)
+@@ -252,24 +221,6 @@ if (NOT HAVE_FAST_MALLOC)
+     endif()
+ endif()
+ 
+-if (NOT HAVE_FAST_MALLOC)
+-    message("Build system will fetch and use JEMalloc")
+-    message("==================================================================")
+-    ExternalProject_Add(libjemalloc
+-        DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external
+-        DOWNLOAD_COMMAND curl -k -L https://github.com/COMBINE-lab/jemalloc/archive/3.6.0.tar.gz -o jemalloc-3.6.0.tar.gz &&
+-        tar -xzf jemalloc-3.6.0.tar.gz
+-        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/jemalloc-3.6.0
+-        BUILD_IN_SOURCE TRUE
+-        INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/install
+-        CONFIGURE_COMMAND sh -c "CC=${CMAKE_C_COMPILER} ./autogen.sh --prefix=<INSTALL_DIR>"
+-        INSTALL_COMMAND cp -r lib <INSTALL_DIR>/ && cp -r include <INSTALL_DIR>/
+-        )
+-
+-    set (FAST_MALLOC_LIB ${CMAKE_CURRENT_SOURCE_DIR}/external/install/lib/libjemalloc.a)
+-    set (HAVE_FAST_MALLOC TRUE)
+-endif ()
+-
+ ###
+ #
+ # Done building external dependencies.
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -84,9 +84,12 @@ set (SUFFARRAY64_LIB ${GAT_SOURCE_DIR}/e

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/rapmap.git