Skip to content

Commit

Permalink
ddisasm,gtirb-pprinter: use boost183 to fix build error
Browse files Browse the repository at this point in the history
gtirb-2.2.0-unstable-2025-01-24-dev/include/gtirb/Context.hpp:146:20:
error: redefinition of 'struct std::hash<boost::uuids::uuid>'
  • Loading branch information
katrinafyi committed Feb 6, 2025
1 parent b81e40b commit 737b330
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions gtirb/ddisasm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, fetchFromGitHub
, fetchzip
, cmake
, boost
, boost183
, lief
, libehp
, gtirb
Expand Down Expand Up @@ -40,7 +40,7 @@ in stdenv.mkDerivation {
})
] ++ lib.optional stdenv.isDarwin ./0001-ddisasm-disable-concurrent-souffle.patch;

buildInputs = [ cmake boost lief gtirb gtirb-pprinter libehp ];
buildInputs = [ cmake boost183 lief gtirb gtirb-pprinter libehp ];
nativeBuildInputs = [ capstone-grammatech souffle ];

cmakeFlags = [ "-DDDISASM_ENABLE_TESTS=OFF" "-DDDISASM_GENERATE_MANY=ON" ];
Expand Down
6 changes: 3 additions & 3 deletions gtirb/gtirb-pprinter.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, fetchFromGitHub
, cmake
, python3
, boost
, boost183
, abseil-cpp
, doxygen
, gtirb
Expand Down Expand Up @@ -31,12 +31,12 @@ stdenv.mkDerivation {
)
'';

buildInputs = [ cmake python3 gtirb boost abseil-cpp gtest ];
buildInputs = [ cmake python3 gtirb boost183 abseil-cpp gtest ];
nativeBuildInputs = [ capstone-grammatech ];

cmakeFlags = [ "-DGTIRB_PPRINTER_ENABLE_TESTS=OFF" ];
CXXFLAGS= [
"-includecstdint"
"-includecstdint"
"-includeset"
"-Wno-error=unused-result"
"-Wno-error=deprecated-declarations"
Expand Down

0 comments on commit 737b330

Please sign in to comment.