control: tag -1 + pending

On Wed, Jun 14, 2023 at 09:29:02AM +0000, Matthias Klose wrote:
> Package: src:nix
> Version: 2.8.0-1.1
> Severity: normal
> Tags: sid trixie
> User: debian-...@lists.debian.org
> Usertags: ftbfs-gcc-13
> 
> [This bug is targeted to the upcoming trixie release]
[snip]
> 
> The package fails to build in a test rebuild on at least amd64 with
> gcc-13/g++-13, but succeeds to build with gcc-12/g++-12. The
> severity of this report will be raised before the trixie release.
> 
> The full build log can be found at:
> http://qa-logs.debian.net/2023/05/22/logs/nix_2.8.0-1.1_unstable_gccexp.log
> The last lines of the build log are at the end of this report.
[snip]
> src/libutil/json.cc: In function ‘void nix::toJSON(std::ostream&, const 
> char*, const char*)’:
> src/libutil/json.cc:33:22: error: ‘uint16_t’ was not declared in this scope
>    33 |             put(hex[(uint16_t(*i) >> 12) & 0xf]);
>       |                      ^~~~~~~~
> src/libutil/json.cc:5:1: note: ‘uint16_t’ is defined in header ‘<cstdint>’; 
> did you forget to ‘#include <cstdint>’?
>     4 | #include <cstring>
>   +++ |+#include <cstdint>
>     5 | 
> make[1]: *** [mk/patterns.mk:3: src/libutil/json.o] Error 1
> make[1]: *** Waiting for unfinished jobs....
> make[1]: Leaving directory '/<<PKGBUILDDIR>>'
> dh_auto_build: error: make -j8 returned exit code 2
> make: *** [debian/rules:31: binary] Error 25
> dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 
> 2

I am attaching the debdiff of the NMU that I uploaded to DELAYED/5 yesterday.

G'luck,
Peter

-- 
Peter Pentchev  r...@ringlet.net r...@debian.org p...@storpool.com
PGP key:        http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint 2EE7 A7A5 17FC 124C F115  C354 651E EFB0 2527 DF13
diff -Nru nix-2.8.0/debian/changelog nix-2.8.0/debian/changelog
--- nix-2.8.0/debian/changelog  2022-10-15 13:28:28.000000000 +0300
+++ nix-2.8.0/debian/changelog  2023-07-22 19:16:28.000000000 +0300
@@ -1,3 +1,11 @@
+nix (2.8.0-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add the gcc13 patch to fix the build with GCC 13.
+    Closes: #1037790
+
+ -- Peter Pentchev <r...@debian.org>  Sat, 22 Jul 2023 19:16:28 +0300
+
 nix (2.8.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru nix-2.8.0/debian/patches/gcc13.patch 
nix-2.8.0/debian/patches/gcc13.patch
--- nix-2.8.0/debian/patches/gcc13.patch        1970-01-01 02:00:00.000000000 
+0200
+++ nix-2.8.0/debian/patches/gcc13.patch        2023-07-22 19:13:41.000000000 
+0300
@@ -0,0 +1,17 @@
+Description: Fix the build with GCC 13
+ Include the <csdint> header for the definition of the uint16_t type.
+Bug-Debian: https://bugs.debian.org/1037790
+Forwarded: no
+Author: Peter Pentchev <r...@ringlet.net>
+Last-Update: 2023-07-22
+
+--- a/src/libutil/json.cc
++++ b/src/libutil/json.cc
+@@ -1,6 +1,7 @@
+ #include "json.hh"
+ 
+ #include <iomanip>
++#include <cstdint>
+ #include <cstring>
+ 
+ namespace nix {
diff -Nru nix-2.8.0/debian/patches/series nix-2.8.0/debian/patches/series
--- nix-2.8.0/debian/patches/series     2022-05-02 21:55:23.000000000 +0300
+++ nix-2.8.0/debian/patches/series     2023-07-22 19:16:28.000000000 +0300
@@ -4,3 +4,4 @@
 fix_nix_DIR_in_doc_local_mk.patch
 
 lowdown_does_not_declare_bsd_dep.patch
+gcc13.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to