Unverified Commit af421ccb authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #261341 from trofi/monotone-gcc-14-fix 

monotone: fix build for upcoming gcc-14
parents b8d6d842 b9a38bf4

pkgs/applications/version-management/monotone/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec { 
      revert = true;

      sha256 = "0fzjdv49dx5lzvqhkvk50lkccagwx8h0bfha4a0k6l4qh36f9j7c";

    })

    ./monotone-1.1-gcc-14.patch

  ];



  postPatch = ''

pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch

0 → 100644
+17 −0
Original line number Diff line number Diff line 
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>