[med-svn] [Git][med-team/arb][master] 3 commits: Fix bundled RAxML 8.2.3 build Closes: #1153055
Andreas Tille (@tille)
gitlab at salsa.debian.org
Mon Nov 9 13:05:28 GMT 2026
Andreas Tille pushed to branch master at Debian Med / arb
Commits:
0a147b11 by Andreas Tille at 2026-11-09T13:54:35+01:00
Fix bundled RAxML 8.2.3 build Closes: #1153055
- - - - -
ce004fb3 by Andreas Tille at 2026-11-09T13:55:56+01:00
Refresh all patches
- - - - -
282faf25 by Andreas Tille at 2026-11-09T14:00:12+01:00
Add matching unsigned int overload, mirroring the existing unsigned long one Closes: #1153516
- - - - -
6 changed files:
- debian/changelog
- debian/patches/110_narrowing.patch
- debian/patches/145_use_system_libeigen.patch
- + debian/patches/fix-i386-build.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+arb (7.0+ds-2) UNRELEASED; urgency=medium
+
+ [ Cheng Li ]
+ * Fix bundled RAxML 8.2.3 build
+ Closes: #1153055
+ * Add matching unsigned int overload, mirroring the existing unsigned
+ long one
+ Closes: #1153516
+
+ -- Andreas Tille <tille at debian.org> Mon, 09 Nov 2026 13:53:13 +0100
+
arb (7.0+ds-1) unstable; urgency=medium
[ Charles Plessy ]
=====================================
debian/patches/110_narrowing.patch
=====================================
@@ -3,9 +3,9 @@ Description: Fix types for arm64, others
To avoid "error: narrowing conversion of '-2' from 'int' to 'char' [-Wnarrowing]"
---- arb.orig/SL/FAST_ALIGNER/ClustalV.cxx
-+++ arb/SL/FAST_ALIGNER/ClustalV.cxx
-@@ -275,7 +275,7 @@
+--- a/SL/FAST_ALIGNER/ClustalV.cxx
++++ b/SL/FAST_ALIGNER/ClustalV.cxx
+@@ -276,7 +276,7 @@ static int getPenalty(char c1, char c2)
static char *result[3]; // result buffers
@@ -14,7 +14,7 @@ To avoid "error: narrowing conversion of '-2' from 'int' to 'char' [-Wnarrowing]
12,
0, 2,
-2, 1, 3,
-@@ -298,7 +298,7 @@
+@@ -299,7 +299,7 @@ static char pam250mt[] = {
-8, -2, -5, -6, -6, -7, -4, -7, -7, -5, -3, 2, -3, -4, -5, -2, -6, 0, 0, 17
};
=====================================
debian/patches/145_use_system_libeigen.patch
=====================================
@@ -28,7 +28,7 @@ Assisted-By: scaleway/deepseek-v4-flash-0731
#include <cxxforward.h>
--- a/RNACMA/Cma.cxx
+++ b/RNACMA/Cma.cxx
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ MatrixXd Cma::computeMutualInformation(V
JointEntropy = computeJointEntropy(seq);
@@ -39,7 +39,7 @@ Assisted-By: scaleway/deepseek-v4-flash-0731
--- a/RNACMA/Makefile
+++ b/RNACMA/Makefile
-@@ -25,8 +25,6 @@
+@@ -25,8 +25,6 @@ ifeq ($(SUPPRESS_WARNINGS),1)
endif
endif
@@ -50,7 +50,7 @@ Assisted-By: scaleway/deepseek-v4-flash-0731
echo "$(LINK_STATIC_LIB) $(MAIN) $(CPP_OBJECTS)"; \
--- a/Makefile
+++ b/Makefile
-@@ -1759,7 +1759,7 @@
+@@ -1737,7 +1737,7 @@ PHYLO/PHYLO.dummy: links_non_perl
PRIMER_DESIGN/PRIMER_DESIGN.dummy: links_non_perl
PROBE_SET/PROBE_SET.dummy: links_non_perl link_db
READSEQ/READSEQ.dummy: links_non_perl
@@ -59,7 +59,7 @@ Assisted-By: scaleway/deepseek-v4-flash-0731
SECEDIT/SECEDIT.dummy: links_non_perl
SEQ_QUALITY/SEQ_QUALITY.dummy: links_non_perl
SERVERCNTRL/SERVERCNTRL.dummy: links_non_perl com
-@@ -2136,11 +2136,7 @@
+@@ -2114,11 +2114,7 @@ redo_links: clean_links
#********************************************************************************
header_libs:
@@ -72,7 +72,7 @@ Assisted-By: scaleway/deepseek-v4-flash-0731
#********************************************************************************
-@@ -2308,7 +2304,6 @@
+@@ -2286,7 +2282,6 @@ clean2: $(SUBDIRS:.sub=.clean) \
objclean \
lib/lib.clean \
GDEHELP/GDEHELP.clean \
=====================================
debian/patches/fix-i386-build.patch
=====================================
@@ -0,0 +1,16 @@
+Author: Cheng Li <shiptux at gmail.com>
+Last-Update: 2026-11-09
+Bug-Debian: https://bugs.debian.org/1153516
+Description: Add matching unsigned int overload, mirroring the existing unsigned long one
+
+--- a/CORE/arb_progress.h
++++ b/CORE/arb_progress.h
+@@ -255,7 +255,7 @@ private:
+ public:
+ // explicitely overload wanted ctors:
+ explicit arb_progress(char *title) { setup(title, 0); }
+- arb_progress(const char *title, unsigned long overall_count) { arb_assert(overall_count<=LONG_MAX); setup(title, overall_count); }
++ arb_progress(const char *title, unsigned int overall_count) { arb_assert(overall_count<=LONG_MAX); setup(title, overall_count); }
+ explicit arb_progress(unsigned long overall_count) { arb_assert(overall_count<=LONG_MAX); setup(NULp, overall_count); }
+
+ void allow_title_reuse() { used->allow_title_reuse(); }
=====================================
debian/patches/series
=====================================
@@ -11,3 +11,4 @@ gcc-16+
130_bundled_raxml_build_c17.patch
140_compile_compat_strip_c_std.patch
145_use_system_libeigen.patch
+fix-i386-build.patch
=====================================
debian/rules
=====================================
@@ -20,6 +20,16 @@ else
ARB_64:=0
endif
+# The bundled RAxML 8.2.3 in GDE/RAxML8 and GDE/SATIVA only builds on x86:
+# axml.c includes <xmmintrin.h> on every architecture except PowerPC, and all
+# three build variants pass -msse, -msse3 or -mavx. Skip both on every other
+# architecture, using the mechanism GDE/Makefile already provides. Neither
+# directory existed in 6.0.6, which built on arm64, armhf, i386, riscv64 and
+# s390x, so nothing that used to work is lost.
+ifeq (,$(filter $(DEB_HOST_ARCH_CPU),i386 amd64))
+ export ARB_BUILD_SKIP_PKGS = RAxML8 SATIVA
+endif
+
LD_LIBRARY_PATH := $(ARBHOME)/lib:$(LD_LIBRARY_PATH)
PATH := $(ARBHOME)/bin:$(PATH)
LC_ALL := C
View it on GitLab: https://salsa.debian.org/med-team/arb/-/compare/c43e7f21d9a6913b46420631bd067fd0e00f5da7...282faf25205d758741ae6869b395b2a2e7146b4b
--
View it on GitLab: https://salsa.debian.org/med-team/arb/-/compare/c43e7f21d9a6913b46420631bd067fd0e00f5da7...282faf25205d758741ae6869b395b2a2e7146b4b
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/20261109/5dabf116/attachment-0001.htm>
More information about the debian-med-commit
mailing list