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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9bfd74deff5e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b2a2131ff0f0
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 24, 2018

  1. meson: Patch around overly strict struct size check. 

    Fixes systemd cross-compile.
    @shlevy
    shlevy committed Mar 24, 2018
    Copy the full SHA
    b2a2131 View commit details
Showing with 16 additions and 0 deletions.
  1. +4 −0 pkgs/development/tools/build-managers/meson/default.nix
  2. +12 −0 pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch
4 changes: 4 additions & 0 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,6 +43,10 @@ in python3Packages.buildPythonApplication rec {
src = ./fix-rpath.patch;
inherit (builtins) storeDir;
})

# No one will ever need more than 128 bytes of data structure
# https://github.com/mesonbuild/meson/issues/3113
./overly-strict-size-check.patch
];

setupHook = ./setup-hook.sh;
12 changes: 12 additions & 0 deletions pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -Naur a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
--- a/mesonbuild/compilers/c.py 2017-12-10 08:37:19.000000000 -0500
+++ b/mesonbuild/compilers/c.py 2018-03-24 07:46:04.739929307 -0400
@@ -406,7 +406,7 @@
}}'''
if not self.compiles(t.format(**fargs), env, extra_args, dependencies):
return -1
- return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies)
+ return self.cross_compute_int('sizeof(%s)' % typename, 1, 1024, None, prefix, env, extra_args, dependencies)

def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None):
if extra_args is None: