BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

binaryen: fix the build

Browse source 
Current `binaryen` fails to build against `gcc-12` as: https://hydra.nixos.org/build/245455591

    [100%] Linking CXX executable ../../bin/binaryen-unittests
    ld: /nix/store/...-gtest-1.12.1/lib/libgtest.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32'
    collect2: error: ld returned 1 exit status

It is a typical mix of libraries built with `gcc-12` and bianries linked
with `gcc-12`'s `libstdc++`.

The change switches back to a default compiler and backports an upstream
`fmin` fix to amend the test.
This commit is contained in:
Sergei Trofimovich 2024-01-02 12:00:36 +00:00
parent 4e922e37b4
commit c56c679c36
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/compilers/binaryen/default.nix
View file

@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/WebAssembly/binaryen/commit/889422e0c92552ff484659f9b41e777ba7ab35c1.patch"; url = "https://github.com/WebAssembly/binaryen/commit/889422e0c92552ff484659f9b41e777ba7ab35c1.patch";
hash = "sha256-acM8mytL9nhm4np9tpUbd1X0wJ7y308HV2fvgcAW1lY="; hash = "sha256-acM8mytL9nhm4np9tpUbd1X0wJ7y308HV2fvgcAW1lY=";
}) })
# Fix fmin tests on gcc-13: https://github.com/WebAssembly/binaryen/pull/5994
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/WebAssembly/binaryen/commit/1e17dfb695a19d5d41f1f88411fbcbc5f2408c8f.patch";
hash = "sha256-5JZh15CXkg5XdTG8eRJXPwO+zmymYeFjKbHutRPTmlU=";
})
]; ];
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];

4
pkgs/top-level/all-packages.nix
View file

@ -15575,10 +15575,10 @@ with pkgs;
bigloo = callPackage ../development/compilers/bigloo { }; bigloo = callPackage ../development/compilers/bigloo { };
binaryen = pin-to-gcc12-if-gcc13 (callPackage ../development/compilers/binaryen { binaryen = callPackage ../development/compilers/binaryen {
nodejs = nodejs-slim; nodejs = nodejs-slim;
inherit (python3Packages) filecheck; inherit (python3Packages) filecheck;
}); };
blueprint-compiler = callPackage ../development/compilers/blueprint { }; blueprint-compiler = callPackage ../development/compilers/blueprint { };