mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 04:02:55 +03:00
bcache-tools: Add gcc5 compatability patch
This commit is contained in:
parent
458552f614
commit
dce591e0b8
@ -21,7 +21,10 @@ stdenv.mkDerivation rec {
|
||||
-i Makefile
|
||||
'';
|
||||
|
||||
patches = [ ./bcache-udev-modern.patch ];
|
||||
patches = [
|
||||
./bcache-udev-modern.patch
|
||||
./fix-static.patch
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\"";
|
||||
|
22
pkgs/tools/filesystems/bcache-tools/fix-static.patch
Normal file
22
pkgs/tools/filesystems/bcache-tools/fix-static.patch
Normal file
@ -0,0 +1,22 @@
|
||||
diff --git a/bcache.c b/bcache.c
|
||||
index 8f37445..79806d8 100644
|
||||
--- a/bcache.c
|
||||
+++ b/bcache.c
|
||||
@@ -26,7 +26,7 @@
|
||||
* x^7 + x^4 + x + 1
|
||||
*/
|
||||
|
||||
-static const uint64_t crc_table[256] = {
|
||||
+const uint64_t crc_table[256] = {
|
||||
0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
|
||||
0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
|
||||
0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
|
||||
@@ -115,7 +115,7 @@ static const uint64_t crc_table[256] = {
|
||||
0x9AFCE626CE85B507ULL
|
||||
};
|
||||
|
||||
-inline uint64_t crc64(const void *_data, size_t len)
|
||||
+uint64_t crc64(const void *_data, size_t len)
|
||||
{
|
||||
uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
|
||||
const unsigned char *data = _data;
|
Loading…
Reference in New Issue
Block a user