mbedtls: add OpenWrt patch for GCC 14 (#358287)

This commit is contained in:
Emily
2024-11-24 21:54:39 +00:00
committed by GitHub
2 changed files with 12 additions and 5 deletions
+12 -1
View File
@@ -1,6 +1,17 @@
{ callPackage }:
{ callPackage, fetchurl }:
callPackage ./generic.nix {
version = "3.6.2";
hash = "sha256-tSWhF8i0Tx9QSFmyDEHdd2xveZvpyd+HXR+8xYj2Syo=";
patches = [
# Fixes the build with GCC 14.
#
# See:
# * <https://github.com/openwrt/openwrt/pull/15479>
# * <https://github.com/Mbed-TLS/mbedtls/issues/9003>
(fetchurl {
url = "https://raw.githubusercontent.com/openwrt/openwrt/52b6c9247997e51a97f13bb9e94749bc34e2d52e/package/libs/mbedtls/patches/100-fix-gcc14-build.patch";
hash = "sha256-20bxGoUHkrOEungN3SamYKNgj95pM8IjbisNRh68Wlw=";
})
];
}
@@ -47,10 +47,6 @@ stdenv.mkDerivation rec {
"-DGEN_FILES=off"
];
env = lib.optionalAttrs (stdenv.cc.isGNU && (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "14")) {
NIX_CFLAGS_COMPILE = "-Wno-error=calloc-transposed-args";
};
doCheck = true;
# Parallel checking causes test failures