Merge pull request #261341 from trofi/monotone-gcc-14-fix
monotone: fix build for upcoming gcc-14
This commit is contained in:
commit
af421ccb0a
2 changed files with 18 additions and 0 deletions
|
@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
|
|||
revert = true;
|
||||
sha256 = "0fzjdv49dx5lzvqhkvk50lkccagwx8h0bfha4a0k6l4qh36f9j7c";
|
||||
})
|
||||
./monotone-1.1-gcc-14.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
Unsetting __STRICT_ANSI__ is not a supported configuration for gcc
|
||||
nowadays. gcc-14 started failing libstdc++ build as it uses gcc
|
||||
extensions without __STRICT_ANSI__: https://gcc.gnu.org/PR111824
|
||||
--- a/src/base.hh
|
||||
+++ b/src/base.hh
|
||||
@@ -34,11 +34,6 @@
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
|
||||
-// Cygwin somehow enables strict ansi, which we don't want.
|
||||
-#ifdef __STRICT_ANSI__
|
||||
-#undef __STRICT_ANSI__
|
||||
-#endif
|
||||
-
|
||||
#include <iosfwd>
|
||||
#include <string> // it would be nice if there were a <stringfwd>
|
||||
|
Loading…
Reference in a new issue