[med-svn] [Git][med-team/raxml-ng][master] 2 commits: Append cmake as a build dependency

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / raxml-ng


Commits:
29831099 by Shayan Doust at 2020-05-29T18:00:06+01:00
Append cmake as a build dependency

- - - - -
c2c893b3 by Shayan Doust at 2020-05-29T18:07:58+01:00
Add patch to modify some options within CMakeLists
libp11-dev is available on debian as a package, but terraphast needs packaging (not necessary?)

- - - - -


3 changed files:

- debian/control
- + debian/patches/modify_cmake_options.patch
- + debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 10),
                flex,
                bison,
                libgmp3-dev,
-               libpll-dev
+               libpll-dev,
+               cmake
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/raxml-ng.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/raxml-ng.git


=====================================
debian/patches/modify_cmake_options.patch
=====================================
@@ -0,0 +1,25 @@
+Description: Set options within CMakeLists for libs
+ Ensure we do not cause cmake to build the "supplied" libraries, instead rely on the already-packaged libraries
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2020-05-29
+---
+--- raxml-ng.orig/CMakeLists.txt
++++ raxml-ng/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ set(CMAKE_DISABLE_SOURCE_CHANGES  ON)
+ 
+ set(RAXML_BINARY_NAME "" CACHE STRING "Custom RAxML-NG binary name")
+-set(USE_LIBPLL_CMAKE ON CACHE BOOL "Use CMake to build libpll and pll-modules")
++set(USE_LIBPLL_CMAKE OFF CACHE BOOL "Use CMake to build libpll and pll-modules")
+ set(BUILD_AS_LIBRARY OFF CACHE BOOL "Build RAxML-NG as shared library (instead of stand-alone executable)")
+ set(PLLMOD_DEBUG OFF CACHE BOOL "Debug pll-modules (tons of console output!)")
+ 
+@@ -20,7 +20,7 @@
+ # build a static binary
+ set(STATIC_BUILD OFF CACHE BOOL "Build static binary")
+ 
+-set(USE_TERRAPHAST ON CACHE BOOL "Use phylogentic terraces library (terraphast) ")
++set(USE_TERRAPHAST OFF CACHE BOOL "Use phylogentic terraces library (terraphast) ")
+ set(USE_GMP OFF CACHE BOOL "Use Gnu Muliple precision (GMP) library ")
+ 
+ set(ENABLE_PTHREADS ${USE_PTHREADS})


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+modify_cmake_options.patch



View it on GitLab: https://salsa.debian.org/med-team/raxml-ng/-/compare/bf4084b52894fbd4d27e41341176c4fa12009834...c2c893b3abbe3d3a29d2b3fec4cf07bcda2693c5

-- 
View it on GitLab: https://salsa.debian.org/med-team/raxml-ng/-/compare/bf4084b52894fbd4d27e41341176c4fa12009834...c2c893b3abbe3d3a29d2b3fec4cf07bcda2693c5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200529/30ef3eba/attachment-0001.html>