[med-svn] [manta] 01/01: Use Debian packaged zlib

[Andreas Tille]

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

tille pushed a commit to branch master
in repository manta.

commit 7d22b9b8b2fa2853b44dfb2736922b57754884d6
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 15 16:28:19 2016 +0100

    Use Debian packaged zlib
---
 debian/patches/series                           |  1 +
 debian/patches/use_debian_packaged_pyflow.patch |  2 +-
 debian/patches/use_debian_packaged_zlib.patch   | 67 +++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/debian/patches/series b/debian/patches/series
index de3c34f..3d28838 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use_debian_packaged_pyflow.patch
+use_debian_packaged_zlib.patch
diff --git a/debian/patches/use_debian_packaged_pyflow.patch b/debian/patches/use_debian_packaged_pyflow.patch
index 859d599..5bef2c3 100644
--- a/debian/patches/use_debian_packaged_pyflow.patch
+++ b/debian/patches/use_debian_packaged_pyflow.patch
@@ -1,6 +1,6 @@
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Tue, 15 Nov 2016 14:29:08 +0100
-Description: Check for Debian packaged pyflow.py
+Description: Check for Debian packaged python-pyflow
 
 --- a/redist/CMakeLists.txt
 +++ b/redist/CMakeLists.txt
diff --git a/debian/patches/use_debian_packaged_zlib.patch b/debian/patches/use_debian_packaged_zlib.patch
new file mode 100644
index 0000000..fa5915a
--- /dev/null
+++ b/debian/patches/use_debian_packaged_zlib.patch
@@ -0,0 +1,67 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 15 Nov 2016 14:29:08 +0100
+Description: Check for Debian packaged zlib
+
+--- a/redist/CMakeLists.txt
++++ b/redist/CMakeLists.txt
+@@ -50,56 +50,10 @@ endif ()
+ #
+ # zlib
+ #
+-set(ZLIB_PREFIX "zlib-1.2.8")
+-superset(ZLIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/${ZLIB_PREFIX}")
+-if (WIN32)
+-    superset(ZLIB_LIBRARY "${ZLIB_DIR}/${CMAKE_BUILD_TYPE}/zlibstatic.lib")
+-else ()
+-    superset(ZLIB_LIBRARY "${ZLIB_DIR}/libz.a")
+-endif ()
+-
+-add_custom_command(
+-	OUTPUT ${ZLIB_DIR}
+-	COMMAND ${CMAKE_COMMAND} -E remove_directory "${ZLIB_DIR}"
+-	COMMAND ${CMAKE_COMMAND} -E tar xjf "${THIS_REDIST_DIR}/${ZLIB_PREFIX}.tar.bz2"
+-	COMMENT "Unpacking zlib package")
+-
+-if (NOT WIN32)
+-    set (ASM_MAKE_OPTION LOC=-DASMV OBJA=match.o)
+-    if (THIS_ARCH MATCHES "^.*86$")
+-        set(ZLIB_ARCH "")
+-        set(ASM_FILE_COPY cp contrib/asm686/match.S match.S)
+-    elseif (THIS_ARCH MATCHES "^x86_64$")
+-        set(ZLIB_ARCH "--64")
+-        set(ASM_FILE_COPY cp contrib/amd64/amd64-match.S match.S)
+-    else ()
+-        set (ZLIB_ARCH "")
+-        set (ASM_FILE_COPY "")
+-        set (ASM_MAKE_OPTION "")
+-    endif ()
+-
+-    add_custom_command(
+-        OUTPUT ${ZLIB_LIBRARY}
+-        COMMAND CC=${CMAKE_C_COMPILER} ${ZLIB_DIR}/configure --prefix="${ZLIB_DIR}" --static ${ZLIB_ARCH} >zlib.config.log
+-        COMMAND ${ASM_FILE_COPY}
+-        COMMAND $(MAKE) ${ASM_MAKE_OPTION} >zlib.build.log 2>zlib.build.error.log
+-        WORKING_DIRECTORY ${ZLIB_DIR}
+-        DEPENDS ${ZLIB_DIR}
+-        COMMENT "Building zlib package")
+-else ()
+-    add_custom_command(
+-        OUTPUT ${ZLIB_LIBRARY}
+-        COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${THIS_CMAKE_PLATFORM} -DCMAKE_C_COMPILER="${CMAKE_C_COMPILER}" ${ZLIB_DIR} >zlib.config.log
+-        COMMAND ${CMAKE_MAKE_PROGRAM}  /p:Configuration=${CMAKE_BUILD_TYPE} "${ZLIB_DIR}/zlib.sln" >zlib.build.log
+-        WORKING_DIRECTORY ${ZLIB_DIR}
+-        DEPENDS ${ZLIB_DIR}
+-        COMMENT "Building zlib package")
+-endif ()
+-
+-
+-set(THIS_ZLIB "${THIS_PROJECT_NAME}_zlib")
+-add_custom_target(${THIS_ZLIB} DEPENDS "${ZLIB_LIBRARY}")
+-
++find_package(ZLIB REQUIRED)
++if (ZLIB_FOUND)
++  set(HAVE_ZLIB 1)
++endif()
+ 
+ #
+ # htslib

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