[med-svn] [salmon] 04/04: Remove liblzma & libbz2 from required packages

[Kevin Murray]

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

daube-guest pushed a commit to branch kdm-cmake-dcontrol-fixes
in repository salmon.

commit de96e0a41bf0128ca1eeb71ac096119019e80da6
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Sat Jan 30 18:34:50 2016 +0200

    Remove liblzma & libbz2 from required packages
---
 ...emove-FIND_PACKAGE-for-liblzma-and-libbz2.patch | 114 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 115 insertions(+)

diff --git a/debian/patches/0009-Remove-FIND_PACKAGE-for-liblzma-and-libbz2.patch b/debian/patches/0009-Remove-FIND_PACKAGE-for-liblzma-and-libbz2.patch
new file mode 100644
index 0000000..9c0a473
--- /dev/null
+++ b/debian/patches/0009-Remove-FIND_PACKAGE-for-liblzma-and-libbz2.patch
@@ -0,0 +1,114 @@
+From: Kevin Murray <spam at kdmurray.id.au>
+Date: Sat, 30 Jan 2016 18:33:36 +0200
+Subject: Remove FIND_PACKAGE for liblzma and libbz2
+
+As these seem not to be required.
+---
+ CMakeLists.txt | 94 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 47 insertions(+), 47 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd6393b..0f320f1 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -174,53 +174,53 @@ if (NOT ZLIB_FOUND)
+ 	message (FATAL_ERROR "zlib must be installed before configuration & building can proceed")
+ endif()
+ 
+-find_package (LibLZMA)
+-if (NOT LIBLZMA_FOUND)
+-    message ("Will attempt to fetch and build liblzma")
+-    message ("=======================================")
+-ExternalProject_Add(liblzma
+-    DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external
+-    URL http://tukaani.org/xz/xz-5.2.0.tar.gz 
+-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/xz-5.2.0
+-    INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/install
+-    BUILD_IN_SOURCE TRUE
+-    CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/external/xz-5.2.0/configure --prefix=<INSTALL_DIR> CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
+-    BUILD_COMMAND make
+-    INSTALL_COMMAND make install
+-)
+-# Tell cmake that the external project generated a library so we can
+-# add dependencies here instead of later
+-set (LIBLZMA_LIBRARIES ${GAT_SOURCE_DIR}/external/install/lib/liblzma.a)
+-set (LIBSTADEN_LDFLAGS "-L${GAT_SOURCE_DIR}/external/install/lib")
+-set (LIBSTADEN_CFLAGS "-I${GAT_SOURCE_DIR}/external/install/include")
+-else()
+-    message("Found liblzma library: ${LIBLZMA_LIBRARIES}")
+-    message("===========================================")
+-endif()
+-
+-find_package (BZip2)
+-if (NOT BZIP2_FOUND)
+-    message ("Will attempt to fetch and build libbz2")
+-    message ("=======================================")
+-ExternalProject_Add(libbz2
+-    DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external
+-    URL http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
+-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/bzip2-1.0.6
+-    INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/install
+-    BUILD_IN_SOURCE TRUE
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND make CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
+-    INSTALL_COMMAND make install PREFIX=<INSTALL_DIR>
+-)
+-# Tell cmake that the external project generated a library so we can
+-# add dependencies here instead of later
+-set (BZIP2_LIBRARIES ${GAT_SOURCE_DIR}/external/install/lib/libbz2.a)
+-set (LIBSTADEN_LDFLAGS "-L${GAT_SOURCE_DIR}/external/install/lib -I${GAT_SOURCE_DIR}/external/install/include")
+-set (LIBSTADEN_CFLAGS "-I${GAT_SOURCE_DIR}/external/install/include")
+-else()
+-    message("Found libbz2 library: ${BZIP2_LIBRARIES}")
+-    message("===========================================")
+-endif()
++# find_package (LibLZMA)
++# if (NOT LIBLZMA_FOUND)
++#     message ("Will attempt to fetch and build liblzma")
++#     message ("=======================================")
++# ExternalProject_Add(liblzma
++#     DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external
++#     URL http://tukaani.org/xz/xz-5.2.0.tar.gz 
++#     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/xz-5.2.0
++#     INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/install
++#     BUILD_IN_SOURCE TRUE
++#     CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/external/xz-5.2.0/configure --prefix=<INSTALL_DIR> CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
++#     BUILD_COMMAND make
++#     INSTALL_COMMAND make install
++# )
++# # Tell cmake that the external project generated a library so we can
++# # add dependencies here instead of later
++# set (LIBLZMA_LIBRARIES ${GAT_SOURCE_DIR}/external/install/lib/liblzma.a)
++# set (LIBSTADEN_LDFLAGS "-L${GAT_SOURCE_DIR}/external/install/lib")
++# set (LIBSTADEN_CFLAGS "-I${GAT_SOURCE_DIR}/external/install/include")
++# else()
++#     message("Found liblzma library: ${LIBLZMA_LIBRARIES}")
++#     message("===========================================")
++# endif()
++
++# find_package (BZip2)
++# if (NOT BZIP2_FOUND)
++#     message ("Will attempt to fetch and build libbz2")
++#     message ("=======================================")
++# ExternalProject_Add(libbz2
++#     DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external
++#     URL http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
++#     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/bzip2-1.0.6
++#     INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/install
++#     BUILD_IN_SOURCE TRUE
++#     CONFIGURE_COMMAND ""
++#     BUILD_COMMAND make CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
++#     INSTALL_COMMAND make install PREFIX=<INSTALL_DIR>
++# )
++# # Tell cmake that the external project generated a library so we can
++# # add dependencies here instead of later
++# set (BZIP2_LIBRARIES ${GAT_SOURCE_DIR}/external/install/lib/libbz2.a)
++# set (LIBSTADEN_LDFLAGS "-L${GAT_SOURCE_DIR}/external/install/lib -I${GAT_SOURCE_DIR}/external/install/include")
++# set (LIBSTADEN_CFLAGS "-I${GAT_SOURCE_DIR}/external/install/include")
++# else()
++#     message("Found libbz2 library: ${BZIP2_LIBRARIES}")
++#     message("===========================================")
++# endif()
+ 
+ ##
+ # Set the latest version and look for what we need
diff --git a/debian/patches/series b/debian/patches/series
index 02a1efc..22910fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ disable-version-check
 use-system-pkg-config-tbb
 0007-Remove-unnecessarily-linked-libraries.patch
 0008-Remove-salmon_core-lib.patch
+0009-Remove-FIND_PACKAGE-for-liblzma-and-libbz2.patch

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