public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

foundationdb: fix "was not declared" build errors

Browse Source 
Since glibc 2.28, `<sys/types.h>` no longer includes
`<sys/sysmacros.h>`, which provides these macros,
so we have to explicitly import the latter, too, to fix the following
build problems:

    flow/Platform.cpp: In function 'void getDiskStatistics(const string&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&)':
    flow/Platform.cpp:626:56: error: 'gnu_dev_major' was not declared in this scope
       if(majorId == (unsigned int) gnu_dev_major(buf.st_dev) && minorId == (unsigned int) gnu_dev_minor(buf.st_dev)) {
                                                            ^
    flow/Platform.cpp:626:111: error: 'gnu_dev_minor' was not declared in this scope
       if(majorId == (unsigned int) gnu_dev_major(buf.st_dev) && minorId == (unsigned int) gnu_dev_minor(buf.st_dev)) {
                                                                                                                   ^
This commit is contained in:
Raphael Borun Das Gupta
2020-10-11 15:32:17 +02:00
parent f1e628e7af
commit 4406883af1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/foundationdb/patches/gcc-fixes.patch
+10 -2
View File
@@ -67,10 +67,18 @@ index b485a8495..82541d439 100644
FlowKnobs const* FLOW_KNOBS = new FlowKnobs(); FlowKnobs const* FLOW_KNOBS = new FlowKnobs();
diff --git a/flow/Platform.cpp b/flow/Platform.cpp diff --git a/flow/Platform.cpp b/flow/Platform.cpp
index 69dac889a..69b86d4ff 100644 index 69dac889a..62bda9edb 100644
--- a/flow/Platform.cpp --- a/flow/Platform.cpp
+++ b/flow/Platform.cpp +++ b/flow/Platform.cpp
@@ -623,7 +623,7 @@ void getDiskStatistics(std::string const& directory, uint64_t& currentIOs, uint6 @@ -40,6 +40,7 @@
#include <algorithm>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <time.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -623,7 +624,7 @@ void getDiskStatistics(std::string const& directory, uint64_t& currentIOs, uint6
unsigned int minorId; unsigned int minorId;
disk_stream >> majorId; disk_stream >> majorId;
disk_stream >> minorId; disk_stream >> minorId;