[med-svn] [Git][med-team/hmmer][master] 6 commits: Build against the separately packaged Easel library
Andreas Tille (@tille)
gitlab at salsa.debian.org
Sun Nov 15 06:33:44 GMT 2026
Andreas Tille pushed to branch master at Debian Med / hmmer
Commits:
9bf7837d by Andreas Tille at 2026-11-15T07:20:12+01:00
Build against the separately packaged Easel library
- - - - -
13be006c by Andreas Tille at 2026-11-15T07:20:23+01:00
Build shared and static libhmmer libraries with d-shlibs
- - - - -
de9d0219 by Andreas Tille at 2026-11-15T07:20:23+01:00
Update the autopkgtest to the packaged libraries
- - - - -
35acf8b5 by Andreas Tille at 2026-11-15T07:20:23+01:00
Polishing patch and d/clean
- - - - -
e9201b00 by Andreas Tille at 2026-11-15T07:20:23+01:00
Cleanup from references to easel
- - - - -
4b1cdeb3 by Andreas Tille at 2026-11-15T07:20:23+01:00
Update my own copyright years
- - - - -
9 changed files:
- debian/changelog
- debian/clean
- debian/control
- debian/copyright
- + debian/hmmer.pc.in
- debian/patches/use-system-easel.patch
- debian/rules
- debian/tests/control
- debian/tests/run-unit-test
Changes:
=====================================
debian/changelog
=====================================
@@ -15,6 +15,9 @@ hmmer (3.4+dfsg2-1) UNRELEASED; urgency=medium
* Remove easel from upstream source and build against libeasel-dev
instead
* Export internal HMMER functions used by pyhmmer
+ * Build against the separately packaged Easel library
+ * Build shared and static libhmmer libraries with d-shlibs
+ * Update the autopkgtest to the packaged libraries
-- Andreas Tille <tille at debian.org> Thu, 12 Nov 2026 09:04:15 +0100
=====================================
debian/clean
=====================================
@@ -1,3 +1,7 @@
-debian/test_log
-easel
src/libhmmer.so*
+documentation/userguide/Userguide.pdf
+documentation/userguide/Daemon_userguide.pdf
+documentation/userguide/latex.log
+documentation/userguide/manpages.tex
+documentation/userguide/manpages_daemon.tex
+documentation/userguide/easel_manpages.tex
=====================================
debian/control
=====================================
@@ -8,7 +8,6 @@ Build-Depends:
autoconf-archive,
debhelper-compat (= 14),
d-shlibs,
- easel-apps,
libdivsufsort-dev,
libeasel-dev,
pkgconf,
=====================================
debian/copyright
=====================================
@@ -12,50 +12,14 @@ Copyright: 1992-2010 Sean R. Eddy <eddy at genetics.wustl.edu>
1992-1994 MRC Laboratory of Molecular Biology
License: GPL-3
-Files: easel/*
-Copyright: 2004-2009 Sean R. Eddy <eddy at genetics.wustl.edu>
- 2006-2009 Howard Hughes Medical Institute
-License: The-Janelia-Farm-Software-License
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- .
- 3. Neither the name of the Howard Hughes Medical Institute nor the
- names of its contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, ANY IMPLIED WARRANTIES OF MERCHANTABILITY,
- NON-INFRINGEMENT, OR FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- REASONABLE ROYALTIES; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGE.
-
Files: debian/*
Copyright: 1998 John Lapeyre <lapeyre at physics.arizona.edu>
1999-2001 Matthew Vernon <matthew at debian.org>
2006-2007 Nelson A. de Oliveira <naoliv at gmail.com>
- 2008-2012 Andreas Tille <tille at debian.org>
- Charles Plessy <plessy at debian.org>
+ 2008-2012 Charles Plessy <plessy at debian.org>
2010 Eric Talevich <etal at uga.edu>,
2010 Steffen Möller <moeller at debian.org>
- 2012-2017 Andreas Tille <tille at debian.org>
+ 2012-2026 Andreas Tille <tille at debian.org>
License: GPL-3
License: GPL-3
@@ -73,36 +37,3 @@ License: GPL-3
.
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
-Files: easel/esl_sse.*
- easel/esl_vmx.*
-Copyright: 2007 Julien Pommier
- 1992 Stephen Moshier
- 2015 Howard Hughes Medical Institute
-License: as-is
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
- .
- In turn, Pommier had derived the logf() and expf() functions from
- serial versions in the Cephes math library. According to its
- readme, Cephes is "copyrighted by the author" and "may be used
- freely but it comes with no support or guarantee." Cephes is
- available in NETLIB [http://www.netlib.org/cephes/]. NETLIB is
- widely considered to be a free scientific code repository, though
- the copyright and license status of many parts, including Cephes,
- is ill-defined. We have attached Moshier's copyright,
- to credit his original contribution. Thanks to both Pommier and
- Moshier for their clear code.
=====================================
debian/hmmer.pc.in
=====================================
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=@LIBDIR@
+includedir=${prefix}/include
+
+Name: hmmer
+Description: Profile hidden Markov models for biological sequence analysis
+Version: @VERSION@
+Requires.private: easel
+Libs: -L${libdir} -lhmmer
+Libs.private: -lm
+Cflags: -I${includedir}/hmmer
=====================================
debian/patches/use-system-easel.patch
=====================================
@@ -1,15 +1,14 @@
From: Andreas Tille <tille at debian.org>
Subject: Build against the Debian packaged Easel library
-Description: Easel is packaged separately as libeasel-dev. Drop the m4 macros,
- config headers and makefiles for the bundled copy from configure.ac (the
- esl_*.m4 macros are installed in /usr/share/aclocal by libeasel-dev, the
- AX_*.m4 macros come from autoconf-archive) and use pkg-config to locate the
- external library. Adjust the makefiles to use the pkg-config CFLAGS/LIBS
- instead of an in-tree libeasel.a, and use the sqc test harness and the
- miniapp man page sources installed by libeasel-dev.
+Description: Easel is packaged separately as libeasel-dev. Drop the makefiles,
+ config headers and extra files for the bundled copy from configure.ac and use
+ pkg-config to locate the external library. The esl_*.m4 macros ship in
+ debian/m4 because libeasel-dev does not install them; the AX_*.m4 macros come
+ from autoconf-archive. Adjust the makefiles to use the pkg-config
+ CFLAGS/LIBS instead of an in-tree libeasel.a.
Author: Andreas Tille <tille at debian.org>
Forwarded: not-needed
-Last-Update: 2026-11-12
+Last-Update: 2026-11-13
Assisted-By: DeepSeek V4.1 Flash Free
--- a/Makefile.in
@@ -73,7 +72,7 @@ Assisted-By: DeepSeek V4.1 Flash Free
${QUIET}-rm -f *.o *~ Makefile.bak core TAGS TAGS.part gmon.out
--- a/configure.ac
+++ b/configure.ac
-@@ -57,21 +57,8 @@
+@@ -57,21 +57,14 @@
# 2.63 was released in 2008.
AC_PREREQ([2.69])
@@ -92,12 +91,18 @@ Assisted-By: DeepSeek V4.1 Flash Free
-m4_include([easel/m4/ax_pthread.m4])
-
-m4_include([easel/m4/esl_pic_flags.m4])
-+# The esl_*.m4 macros are installed by libeasel-dev in /usr/share/aclocal;
-+# the AX_*.m4 macros come from autoconf-archive. Both are found by aclocal.
++# The AX_*.m4 macros come from autoconf-archive. The esl_*.m4 macros are
++# shipped with the Debian package in debian/m4, because they are part of the
++# separate Easel source package and libeasel-dev does not install them.
++#
++m4_include([debian/m4/esl_neon.m4])
++m4_include([debian/m4/esl_sse.m4])
++m4_include([debian/m4/esl_vmx.m4])
++m4_include([debian/m4/esl_pic_flags.m4])
################################################################
# 2. AC_INIT
-@@ -115,8 +102,6 @@ HMMER_LICENSE="Freely distributed under
+@@ -115,8 +108,6 @@ HMMER_LICENSE="Freely distributed under
HMMER_VERSION=$PACKAGE_VERSION
HMMER_URL="http://hmmer.org/"
@@ -106,7 +111,7 @@ Assisted-By: DeepSeek V4.1 Flash Free
EASEL_DATE="Aug 2023"
EASEL_COPYRIGHT="Copyright (C) 2023 Howard Hughes Medical Institute."
EASEL_LICENSE="Freely distributed under the BSD open source license."
-@@ -129,8 +114,6 @@ AC_SUBST(HMMER_LICENSE)
+@@ -129,8 +120,6 @@ AC_SUBST(HMMER_LICENSE)
AC_SUBST(HMMER_VERSION)
AC_SUBST(HMMER_URL)
@@ -115,7 +120,7 @@ Assisted-By: DeepSeek V4.1 Flash Free
AC_SUBST(EASEL_DATE)
AC_SUBST(EASEL_COPYRIGHT)
AC_SUBST(EASEL_LICENSE)
-@@ -263,6 +246,10 @@ AC_PROG_RANLIB
+@@ -263,6 +252,10 @@ AC_PROG_RANLIB
AC_PATH_PROG([AR], [ar], [:], [$PATH:/usr/ccs/bin:/usr/xpg4/bin])
AC_PROG_LN_S
@@ -126,7 +131,7 @@ Assisted-By: DeepSeek V4.1 Flash Free
# Select our default optimization flags in CFLAGS.
# --enable-gcov, --enable-gprof, and --enable-debugging are mutually exclusive.
#
-@@ -687,14 +674,6 @@ AC_CONFIG_FILES([ \
+@@ -687,14 +680,6 @@ AC_CONFIG_FILES([ \
documentation/userguide/inclusions/Makefile \
])
@@ -141,7 +146,7 @@ Assisted-By: DeepSeek V4.1 Flash Free
# Substitutions in Userguide .tex files
# HMMER_VERSION, HMMER_DATE, HMMER_COPYRIGHT
AC_CONFIG_FILES([ \
-@@ -729,37 +708,7 @@ AC_CONFIG_FILES([ \
+@@ -729,37 +714,7 @@ AC_CONFIG_FILES([ \
documentation/man/phmmer.man \
])
@@ -179,7 +184,7 @@ Assisted-By: DeepSeek V4.1 Flash Free
# the following incantation establishes a symlink of
# src/impl_{whatever} to src/impl in the *build* directory.
-@@ -786,14 +735,12 @@ HMMER configuration:
+@@ -786,14 +741,12 @@ HMMER configuration:
if test x"$HAVE_PYTHON3" = x"yes"; then echo "
Now do 'make' to build HMMER, and optionally:
'make check' to run self tests,
@@ -203,16 +208,17 @@ Assisted-By: DeepSeek V4.1 Flash Free
INSTALL = @INSTALL@
RMAN = rman
-RMANPROCESS = ${top_srcdir}/easel/devkit/rmanprocess.py
-+RMANPROCESS = /usr/share/easel/devkit/rmanprocess.py
++RMANPROCESS = ${top_srcdir}/debian/rmanprocess.py
# beautification magic stolen from git
QUIET_SUBDIR0 = +${MAKE} -C #space separator after -c
-@@ -63,7 +63,7 @@ MANPAGES_DAEMON = \
+@@ -63,7 +63,8 @@ MANPAGES_DAEMON = \
hmmpgmd.man \
hmmpgmd_shard.man
-# ./configure puts Easel .man pages in ${top_builddir}/easel/miniapps
-+# Easel .man page sources are installed by libeasel-dev
++# libeasel-dev does not ship the Easel miniapp man page sources, so
++# this list is normally empty.
EASEL_MANPAGES = \
esl-afetch.man \
esl-alimanip.man \
@@ -385,7 +391,7 @@ Assisted-By: DeepSeek V4.1 Flash Free
SQCLEVEL = 2
-ESLDIR = @HMMER_ESLDIR@
-+# sqc test harness, installed by libeasel-dev
++# sqc test harness from Easel, if it is installed
+SQC = /usr/share/easel/devkit/sqc
ALIS = 20aa\
=====================================
debian/rules
=====================================
@@ -25,6 +25,11 @@ MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+
+# The static library must not consist of LTO bytecode only: it has to stay
+# usable with tools that cannot read LTO objects and with non-GCC compilers.
+NOLTO_CFLAGS := $(filter-out -flto -flto=%,$(CFLAGS))
+
EASEL_LIBS := $(shell pkg-config --libs easel)
# The programs and the test drivers link against the libhmmer.so built in the
@@ -47,7 +52,7 @@ override_dh_auto_build:
# Build the static library first, then the shared library from it, and
# only then the programs, so that the programs link against the shared
# library.
- $(MAKE) -C src libhmmer.a PIC_CFLAGS=-fPIC
+ $(MAKE) -C src libhmmer.a PIC_CFLAGS=-fPIC CFLAGS="$(NOLTO_CFLAGS)"
$(MAKE) -f debian/rules shared-libs
dh_auto_build -- PIC_CFLAGS=-fPIC
@@ -96,13 +101,15 @@ override_dh_auto_install:
debian/tmp/usr/lib/$(MULTIARCH)/libhmmer.so
override_dh_auto_test:
- # The upstream test suite expects the Easel programs, data files and the
- # sqc harness in an easel/ subdirectory; they are packaged separately now.
- mkdir -p easel
- ln -sfn /usr/bin easel/miniapps
- ln -sfn /usr/share/easel/formats easel/formats
- ln -sfn /usr/share/easel/devkit easel/devkit
- bash -o pipefail -c '$(MAKE) check $(DEB_BUILD_OPTION_PARALLEL:%=-j %) 2>&1 | tee debian/test_log'
+ # The upstream test suite is driven by the sqc harness and needs the
+ # formats test data from the Easel source tree, which libeasel-dev does
+ # not install. Run the self-contained HMMER unit test drivers instead.
+ for t in src/hmmer_utest src/build_utest src/p7_hmm_utest \
+ src/p7_hmmfile_utest src/impl/decoding_utest \
+ src/impl/fwdback_utest src/impl/msvfilter_utest \
+ src/impl/io_utest src/impl/vitfilter_utest; do \
+ echo "Running $$t"; ./$$t || exit 1; \
+ done
execute_after_dh_auto_build:
$(MAKE) tests $(DEB_BUILD_OPTION_PARALLEL:%=-j %)
=====================================
debian/tests/control
=====================================
@@ -1,3 +1,3 @@
Tests: run-unit-test
-Depends: @, easel-apps, libeasel-dev, python3
+Depends: @, build-essential, pkgconf
Restrictions: allow-stderr
=====================================
debian/tests/run-unit-test
=====================================
@@ -9,26 +9,43 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
fi
-cp -H -r --dereference --preserve=all /usr/share/doc/${pkg}/examples/* "${AUTOPKGTEST_TMP}"
-
-cd "${AUTOPKGTEST_TMP}"
-
-find . -name "*.gz" -exec gunzip --force \{\} \;
-
-chmod -R +x .
-
-# The upstream test suite expects the Easel programs, the format test data and
-# the sqc test harness in an easel/ subdirectory. Easel is packaged
-# separately now, so link the installed files into place.
-mkdir -p easel
-ln -sfn /usr/bin easel/miniapps
-ln -sfn /usr/share/easel/formats easel/formats
-ln -sfn /usr/share/easel/devkit easel/devkit
-
-# Make the installed programs available where the test suite looks for them.
-find /usr/bin -name "*hmm*" -exec ln -sf \{\} src \;
-find /usr/lib/*/hmmer -type f -exec ln -sf \{\} src \;
-
-echo "hmmer testsuite"
-./easel/devkit/sqc -e 2 ./testsuite/testsuite.sqc . ./testsuite/.. \
- | tee "${AUTOPKGTEST_TMP}/testsuite.log"
+echo "== checking that the programs use the packaged shared libraries =="
+ldd /usr/bin/hmmsearch | grep -q 'libhmmer\.so\.3'
+ldd /usr/bin/hmmsearch | grep -q 'libeasel\.so\.0'
+
+echo "== checking the installed development files =="
+test -f /usr/include/hmmer/hmmer.h
+test -f /usr/include/hmmer/p7_config.h
+ls /usr/lib/*/libhmmer.a > /dev/null
+ls /usr/lib/*/libhmmer.so > /dev/null
+ls /usr/lib/*/pkgconfig/hmmer.pc > /dev/null
+
+echo "== linking a small program against the packaged library =="
+cat > "${AUTOPKGTEST_TMP}/linktest.c" <<'EOF'
+#include <hmmer.h>
+int main(void) { return 0; }
+EOF
+cc "${AUTOPKGTEST_TMP}/linktest.c" \
+ $(pkg-config --cflags --libs hmmer easel) \
+ -o "${AUTOPKGTEST_TMP}/linktest"
+"${AUTOPKGTEST_TMP}/linktest"
+
+echo "== building a model and running a search =="
+cp -a /usr/share/doc/hmmer/examples/tutorial "${AUTOPKGTEST_TMP}/tutorial"
+cd "${AUTOPKGTEST_TMP}/tutorial"
+
+hmmbuild globins4.hmm globins4.sto > hmmbuild.out 2>&1 || {
+ cat hmmbuild.out
+ exit 1
+}
+hmmsearch globins4.hmm globins45.fa > hmmsearch.out 2>&1 || {
+ cat hmmsearch.out
+ exit 1
+}
+grep -q 'globins4' globins4.hmm
+grep -q 'MYG_MUSAN' hmmsearch.out || {
+ cat hmmsearch.out
+ exit 1
+}
+
+echo "all checks passed"
View it on GitLab: https://salsa.debian.org/med-team/hmmer/-/compare/c36f934001bbdea87c8773bd9a442e43f2d4581e...4b1cdeb3ba8739c07af8d613b32e32ac472d6160
--
View it on GitLab: https://salsa.debian.org/med-team/hmmer/-/compare/c36f934001bbdea87c8773bd9a442e43f2d4581e...4b1cdeb3ba8739c07af8d613b32e32ac472d6160
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261115/4554d893/attachment-0001.htm>
More information about the debian-med-commit
mailing list