[med-svn] [Git][med-team/libmaus2][master] 4 commits: d/rules: enable autoarray tracing.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Fri Feb 28 20:36:31 GMT 2025
Étienne Mollier pushed to branch master at Debian Med / libmaus2
Commits:
2a499f4c by Étienne Mollier at 2025-02-28T21:33:52+01:00
d/rules: enable autoarray tracing.
The idea is to hopefully facilitate tracing build errors leading to
bugs #1069691 and #1091144.
- - - - -
9f58c66a by Étienne Mollier at 2025-02-28T21:34:10+01:00
gcc-15.patch: new: fix build failures with gcc-15.
Closes: #1097230, #1096372
- - - - -
96b944a2 by Étienne Mollier at 2025-02-28T21:35:00+01:00
d/control: declare compliance to standards version 4.7.2.
- - - - -
07f180a5 by Étienne Mollier at 2025-02-28T21:36:07+01:00
d/changelog: ready for upload to unstable.
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/gcc-15.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+libmaus2 (2.0.813+ds-4) unstable; urgency=medium
+
+ * d/rules: enable autoarray tracing.
+ The idea is to hopefully facilitate tracing build errors leading to
+ bugs #1069691 and #1091144.
+ * gcc-15.patch: new: fix build failures with gcc-15.
+ (Closes: #1097230, #1096372)
+ * d/control: declare compliance to standards version 4.7.2.
+
+ -- Étienne Mollier <emollier at debian.org> Fri, 28 Feb 2025 21:35:58 +0100
+
libmaus2 (2.0.813+ds-3) unstable; urgency=medium
* d/watch: move to straight git tag surveying.
=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
libsecrecy-dev,
pkgconf,
zlib1g-dev
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/med-team/libmaus2
Vcs-Git: https://salsa.debian.org/med-team/libmaus2.git
Homepage: https://gitlab.com/german.tischler/libmaus2
=====================================
debian/patches/gcc-15.patch
=====================================
@@ -0,0 +1,68 @@
+Description: Fix build failure with gcc-15.
+ This patch fixes the following type of build failures with gcc-15:
+ .
+ In file included from ./libmaus2/lz/Lz4DecoderBuffer.hpp:24,
+ from libmaus2/lz/Lz4DecoderBuffer.cpp:19:
+ ./libmaus2/aio/InputStreamInstance.hpp:44:86: error: ‘uint64_t’ has not been declared
+ 44 | static int getSymbolAtPosition(std::string const & filename, uint64_t const offset)
+ | ^~~~~~~~
+ ./libmaus2/aio/InputStreamInstance.hpp:22:1: note: ‘uint64_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
+ 21 | #include <libmaus2/aio/InputStreamPointerWrapper.hpp>
+ +++ |+#include <cstdint>
+ 22 | #include <istream>
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097230
+Forwarded: https://gitlab.com/german.tischler/libmaus2/-/merge_requests/23
+Last-Update: 2025-02-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- libmaus2.orig/src/libmaus2/aio/InputStreamInstance.hpp
++++ libmaus2/src/libmaus2/aio/InputStreamInstance.hpp
+@@ -18,6 +18,7 @@
+ #if ! defined(LIBMAUS2_AIO_INPUTSTREAMINSTANCE_HPP)
+ #define LIBMAUS2_AIO_INPUTSTREAMINSTANCE_HPP
+
++#include <cstdint>
+ #include <libmaus2/aio/InputStreamPointerWrapper.hpp>
+ #include <istream>
+
+--- libmaus2.orig/src/libmaus2/lz/ZlibInterface.hpp
++++ libmaus2/src/libmaus2/lz/ZlibInterface.hpp
+@@ -18,6 +18,7 @@
+ #if ! defined(LIBMAUS2_LZ_ZLIBINTERFACE_HPP)
+ #define LIBMAUS2_LZ_ZLIBINTERFACE_HPP
+
++#include <cstdint>
+ #include <memory>
+
+ namespace libmaus2
+--- libmaus2.orig/src/libmaus2/aio/OutputStreamFactory.hpp
++++ libmaus2/src/libmaus2/aio/OutputStreamFactory.hpp
+@@ -19,6 +19,7 @@
+ #if ! defined(LIBMAUS2_AIO_OUTPUTSTREAMFACTORY_HPP)
+ #define LIBMAUS2_AIO_OUTPUTSTREAMFACTORY_HPP
+
++#include <cstdint>
+ #include <libmaus2/aio/OutputStream.hpp>
+ #include <memory>
+
+--- libmaus2.orig/src/libmaus2/util/GetCObject.hpp
++++ libmaus2/src/libmaus2/util/GetCObject.hpp
+@@ -19,6 +19,7 @@
+ #if ! defined(LIBMAUS2_UTIL_GETCOBJECT_HPP)
+ #define LIBMAUS2_UTIL_GETCOBJECT_HPP
+
++#include <cstdint>
+ #include <memory>
+ #include <iterator>
+
+--- libmaus2.orig/src/libmaus2/parallel/SimpleThreadWorkPackage.hpp
++++ libmaus2/src/libmaus2/parallel/SimpleThreadWorkPackage.hpp
+@@ -19,6 +19,7 @@
+ #if ! defined(LIBMAUS2_PARALLEL_SIMPLETHREADWORKPACKAGE_HPP)
+ #define LIBMAUS2_PARALLEL_SIMPLETHREADWORKPACKAGE_HPP
+
++#include <cstdint>
+ #include <ostream>
+ #include <memory>
+
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
add-support-for-loong64.patch
+gcc-15.patch
=====================================
debian/rules
=====================================
@@ -8,13 +8,21 @@ BUILT_USING_SECRECY = $(shell \
-W 'libsecrecy-dev' \
)
-# include /usr/share/dpkg/default.mk
+include /usr/share/dpkg/architecture.mk
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
dh $@
+# We go extra lengths to try to pinpoint test failures on arm64, but
+# autoarraytrace is also causing issues of its own on at least i386, so
+# it needs to be enabled only on the affected platform.
+ifeq ($(DEB_HOST_ARCH),arm64)
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-autoarraytrace
+endif
+
override_dh_install:
dh_install
# following override suggestion from suggestion of Andreas to Michael
View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/5ef75e2bb0ed585a2f44a54e0b74b9ac4655d627...07f180a5920c52a88a6dce588cd1d2514cd85a5e
--
View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/5ef75e2bb0ed585a2f44a54e0b74b9ac4655d627...07f180a5920c52a88a6dce588cd1d2514cd85a5e
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/20250228/9fd43cd9/attachment-0001.htm>
More information about the debian-med-commit
mailing list