lol

Merge pull request #234872 from trofi/nss_esr-gcc-13-fix

nss_esr: backport gcc-13 fix

authored by

Martin Weinelt and committed by
GitHub
0967ea4c 5611fa71

+49
+44
pkgs/development/libraries/nss/gcc-13-esr.patch
··· 1 + https://bugzilla.mozilla.org/show_bug.cgi?id=1771273 2 + https://hg.mozilla.org/projects/nss/raw-rev/21e7aaa1f7d94bca15d997e5b4c2329b32fad21a 3 + 4 + # HG changeset patch 5 + # User Sergei Trofimovich <slyich@gmail.com> 6 + # Date 1653552519 0 7 + # Node ID 21e7aaa1f7d94bca15d997e5b4c2329b32fad21a 8 + # Parent ad1046e9eee5f5dc17dac7c9343e2f7f0da44b4e 9 + Bug 1771273 - cpputil/databuffer.h: add missing <cstdint> include r=nss-reviewers,mt 10 + 11 + Without the change build fails on this week's gcc-13 snapshot as: 12 + 13 + ../../cpputil/databuffer.h:20:20: error: 'uint8_t' does not name a type 14 + 20 | DataBuffer(const uint8_t* d, size_t l) : data_(nullptr), len_(0) { 15 + | ^~~~~~~ 16 + ../../cpputil/databuffer.h:14:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? 17 + 13 | #include <iostream> 18 + +++ |+#include <cstdint> 19 + 14 | 20 + 21 + Differential Revision: https://phabricator.services.mozilla.com/D147404 22 + 23 + diff --git a/cpputil/databuffer.h b/cpputil/databuffer.h 24 + --- nss/cpputil/databuffer.h 25 + +++ nss/cpputil/databuffer.h 26 + @@ -6,16 +6,17 @@ 27 + 28 + #ifndef databuffer_h__ 29 + #define databuffer_h__ 30 + 31 + #include <algorithm> 32 + #include <cstring> 33 + #include <iomanip> 34 + #include <iostream> 35 + +#include <cstdint> 36 + 37 + namespace nss_test { 38 + 39 + class DataBuffer { 40 + public: 41 + DataBuffer() : data_(nullptr), len_(0) {} 42 + DataBuffer(const uint8_t* d, size_t l) : data_(nullptr), len_(0) { 43 + Assign(d, l); 44 +
+5
pkgs/development/libraries/nss/generic.nix
··· 47 47 ./85_security_load_3.85+.patch 48 48 ) 49 49 ./fix-cross-compilation.patch 50 + ] ++ lib.optionals (lib.versionOlder version "3.89") [ 51 + # Backport gcc-13 build fix: 52 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1771273 53 + # https://hg.mozilla.org/projects/nss/raw-rev/21e7aaa1f7d94bca15d997e5b4c2329b32fad21a 54 + ./gcc-13-esr.patch 50 55 ]; 51 56 52 57 patchFlags = [ "-p0" ];