Commit Graph

9 Commits

Author SHA1 Message Date
Sandro
a908dd415d
Merge pull request #114176 from omasanori/fix-foundationdb61
foundationdb61: 6.1.12 -> 6.1.13, fix build
2021-03-05 02:12:20 +01:00
Masanori Ogino
cd98de0816 foundationdb60: fix build
- Add missing #include, mainly <cmath>
- Add missing 'std::'
- Remove prototype conflicting with the libc's definition

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2021-02-24 12:48:58 +09:00
Masanori Ogino
3aa47450f1 foundationdb61: 6.1.12 -> 6.1.13, fix build
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2021-02-24 06:19:32 +09:00
Raphael Borun Das Gupta
450de176cf foundationdb: fix build: use glibc's gettid()
to avoid build error due to conflicting declaration:

    flow/Profiler.actor.cpp: In function 'uint64_t gettid()':
    flow/Profiler.actor.cpp:56:17: error: ambiguating new declaration of 'uint64_t gettid()'
      FILE* f;
                     ^
    In file included from /nix/store/4wy9j24psf9ny4di3anjs7yk2fvfb0gq-glibc-2.31-dev/include/unistd.h:1170:0,
                     from ./flow/Platform.h:49,
                     from ./flow/flow.h:40,
                     from flow/Profiler.actor.cpp:39:
    /nix/store/4wy9j24psf9ny4di3anjs7yk2fvfb0gq-glibc-2.31-dev/include/bits/unistd_ext.h:34:16: note: old declaration '__pid_t gettid()'
     extern __pid_t gettid (void) __THROW;
                    ^~~~~~
2020-10-11 19:53:53 +02:00
Raphael Borun Das Gupta
4406883af1 foundationdb: fix "was not declared" build errors
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)) {
                                                                                                                   ^
2020-10-11 15:32:17 +02:00
Raphael Borun Das Gupta
f1e628e7af foundationdb: refresh gcc-fixes-patch
by applying it to apple/foundationdb@5.1.7 and running

    git diff > ${path_to_nixpkgs}/pkgs/servers/foundationdb/patches/gcc-fixes.patch

again.
2020-10-11 15:25:28 +02:00
Maximilian Bosch
a064678390
foundationdb5: build with gcc6 2020-01-28 20:11:02 +01:00
Austin Seipp
3f1c6801a2
foundationdb: init 6.1.6pre4898_26fbbbf, cmake build
This adds a new build of FoundationDB 6.1, using the new, much improved
with CMake build system with fewer patches and rough edges.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-15 09:54:10 -05:00
Austin Seipp
a13a0c8de4
foundationdb: refactor vsmake patch application
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-15 09:54:10 -05:00