diff options
author | Lucas Ransan <lucas@ransan.tk> | 2020-12-27 10:39:41 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-28 08:43:33 +0100 |
commit | 68a4db344659bec2bd6d7b4286165dd92ec2f29d (patch) | |
tree | f514da8bbeb9a96ad53c491586753afccbcdc86b /pkgs/os-specific | |
parent | 97a279c71df591debd077a497196e672707d642b (diff) | |
download | nixpkgs-68a4db344659bec2bd6d7b4286165dd92ec2f29d.tar nixpkgs-68a4db344659bec2bd6d7b4286165dd92ec2f29d.tar.gz nixpkgs-68a4db344659bec2bd6d7b4286165dd92ec2f29d.tar.bz2 nixpkgs-68a4db344659bec2bd6d7b4286165dd92ec2f29d.tar.lz nixpkgs-68a4db344659bec2bd6d7b4286165dd92ec2f29d.tar.xz nixpkgs-68a4db344659bec2bd6d7b4286165dd92ec2f29d.tar.zst nixpkgs-68a4db344659bec2bd6d7b4286165dd92ec2f29d.zip |
syslinux: fix build on gcc10
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/syslinux/default.nix | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/syslinux/gcc10.patch | 33 |
2 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 28681aed564..559fb6219b4 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation { url = mkURL "26f0e7b2" "0018-prevent-pow-optimization.patch"; sha256 = "1c8g0jz5yj9a0rsmryx9vdjsw4hw8mjfcg05c9pmyjg85w3dfp3m"; }) + ./gcc10.patch ]; postPatch = '' diff --git a/pkgs/os-specific/linux/syslinux/gcc10.patch b/pkgs/os-specific/linux/syslinux/gcc10.patch new file mode 100644 index 00000000000..f4893a91231 --- /dev/null +++ b/pkgs/os-specific/linux/syslinux/gcc10.patch @@ -0,0 +1,33 @@ +diff --git a/dos/string.h b/dos/string.h +index f648de2..a502132 100644 +--- a/dos/string.h ++++ b/dos/string.h +@@ -5,12 +5,13 @@ + #ifndef _STRING_H + #define _STRING_H + ++#include <stddef.h> ++ + /* Standard routines */ + #define memcpy(a,b,c) __builtin_memcpy(a,b,c) + #define memmove(a,b,c) __builtin_memmove(a,b,c) + #define memset(a,b,c) __builtin_memset(a,b,c) + #define strcpy(a,b) __builtin_strcpy(a,b) +-#define strlen(a) __builtin_strlen(a) + + /* This only returns true or false */ + static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) +@@ -21,6 +22,13 @@ static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) + return rv; + } + ++static inline size_t strlen(const char *s) ++{ ++ size_t len = 0; ++ while (*s++) len++; ++ return len; ++} ++ + extern char *strchr(const char *s, int c); + + #endif /* _STRING_H */ |