Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 423dd60f079d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f9176c0edb2b
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 11, 2020

  1. 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.
    das-g committed Oct 11, 2020
    Copy the full SHA
    f1e628e View commit details
    Browse the repository at this point in the history
  2. 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)) {
                                                                                                                       ^
    das-g committed Oct 11, 2020
    Copy the full SHA
    4406883 View commit details
    Browse the repository at this point in the history
  3. 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;
                        ^~~~~~
    das-g committed Oct 11, 2020
    Copy the full SHA
    450de17 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. Copy the full SHA
    f9176c0 View commit details
    Browse the repository at this point in the history