3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

45 commits

Author SHA1 Message Date
Will Dietz 5aaf597df3 meson: 0.49.0 -> 0.49.1
https://groups.google.com/d/msg/mesonbuild/xRXQatmXIwo/-2lqsOIXGAAJ

https://github.com/mesonbuild/meson/milestone/33
2019-01-27 15:28:01 -06:00
Jan Tojnar 2f4e167156
meson: Fix linking ObjC objects on Darwin
https://github.com/NixOS/nixpkgs/pull/54007#issuecomment-454693658
2019-01-16 13:21:40 +01:00
Jan Tojnar 414ea0a10e
meson: 0.48.2 → 0.49.0 2018-12-12 00:22:02 +01:00
Matthew Bauer d492f53faf
Merge pull request from matthewbauer/ninja-check-phase
Add check phase to ninja setup hook
2018-11-20 16:55:12 -06:00
Tor Hedin Brønner 7a48c7ccf8 meson: remove obsolete and blocking patch
meson is now upgraded to 0.48.2 which includes the patch causing the build to
fail.
2018-11-19 12:11:06 +01:00
Matthew Bauer f6f7283e69 meson: remove check phase
This is now handled in ninja.
2018-11-18 19:31:01 -06:00
Jan Tojnar 85bd2a7acb
Merge pull request from jtojnar/meson-0.47
meson: 0.46.1 → 0.48.2
2018-11-18 22:17:49 +01:00
Jan Tojnar 340dd80175
meson: 0.46.1 → 0.48.2 2018-11-13 14:39:34 +01:00
Frederik Rietdijk 53d00c3351 Merge master into staging-next 2018-11-10 11:08:54 +01:00
volth 9e1b883144 meson: fix cross compilation of systemd
Co-authored-by: Robin Gloster <mail@glob.in>
2018-11-05 14:39:30 -05:00
Frederik Rietdijk 64d50a0099 meson: fix building with python 3.7 2018-11-04 08:46:30 +01:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
John Ericson 34da7e2ce2 treewide: Remove stdenv.isCross
I *want* cross-specific overrides to be verbose, so I rather not have
this shorthand. This makes the syntactic overhead more proportional to
the maintainence cost. Hopefully this pushes people towards fewer
conditionals and more abstractions.
2018-08-02 15:01:58 -04:00
Frederik Rietdijk 099c13da1b Merge staging-next into master ()
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes 

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes .

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Frederik Rietdijk ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Uli Baum 6f0c92fda9 meson: set auto_features=disabled 2018-07-09 23:06:25 +02:00
R. RyanTM 305ac4dade meson: 0.46.1 -> 0.47.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/meson/versions.

These checks were done:

- built on NixOS
- /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/meson passed the binary check.
- Warning: no invocation of /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/mesonconf had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/mesonintrospect had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/mesontest had a zero exit code or showed the expected version
- /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/wraptool passed the binary check.
- 2 of 5 passed binary check by having a zero exit code.
- 1 of 5 passed binary check by having the new version present in output.
- found 0.47.0 with grep in /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0
- directory tree listing: https://gist.github.com/921992f726772b72a0e2ccd9591141b1
- du listing: https://gist.github.com/22365bf0c1a1ab300e07e36d205c7eb7
2018-07-03 22:41:48 -07:00
Patrick Hilhorst 0415710a5d treewide: removed name from a few pythonpackages defining pname and version 2018-06-07 18:06:25 +02:00
Jan Tojnar 405cb86037
meson: 0.45.1 → 0.46.1 2018-05-22 20:31:17 +02:00
Jan Tojnar fdd1625d17
meson: 0.44.0 → 0.45.1
http://mesonbuild.com/Release-notes-for-0-45-0.html
2018-03-27 22:34:30 +02:00
Shea Levy b2a2131ff0
meson: Patch around overly strict struct size check.
Fixes systemd cross-compile.
2018-03-24 07:50:16 -04:00
Jan Tojnar bfa24c12a5
meson: set multiple output dirs in setup hook
Closes: 
2018-03-22 07:33:49 +01:00
Jan Tojnar fe73013e7d
meson: allow dirs outside of prefix
Upstream insists on not allowing bindir and other dir options
outside of prefix for some reason:

https://github.com/mesonbuild/meson/issues/2561

We remove the check so multiple outputs can work sanely.
2018-03-22 07:33:49 +01:00
Jan Tojnar de910a040b
meson: fix rpath fixup
In common distributions, RPATH is only needed for internal libraries so
meson removes everything else. With Nix, the locations of libraries
are not as predictable, therefore we need to keep them in the RPATH. [1]

Previously we have just kept the RPATH produced by the linker, patching
meson not to remove it. This deprived us of potentially replacing it
with install_rpath provided by project so we had to re-add it manually,
and also introduced a vulnerability of keeping build paths in RPATH.

This commit restores the clean-up but modifies it so the items starting
with /nix/store are retained.

This should be relatively safe since the store is immutable, however,
there might be some unwanted retainment of build_rpath [2] if it contains
paths from Nix store.

[1]: https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
[2]: http://mesonbuild.com/Release-notes-for-0-42-0.html#added-build_rpath-keyword-argument
2018-03-22 07:30:58 +01:00
Shea Levy 044c65bd06
Merge branch 'systemd-cross' into staging 2018-02-26 07:42:21 -05:00
Shea Levy 284f75a258
meson: Support cross-compiling 2018-02-26 06:38:32 -05:00
Jan Tojnar 40eadf9eb0
meson: print failed test logs 2018-02-18 16:24:50 +01:00
Jan Tojnar edd5be9eff
meson: set checkPhase in setup hook 2018-01-06 06:47:57 +01:00
Jan Tojnar 1e60ccdf47 meson: 0.43.0 → 0.44.0 2017-12-14 22:56:35 +00:00
Orivej Desh 46f57dbc14 meson: enable parallel building of meson projects by default 2017-12-07 08:52:42 +00:00
Jan Tojnar 1dba3c06eb
meson: pass library install paths to g-ir-scanner
We are patching g-ir-scanner to produce absolute paths in the GIR
files. When an application uses an internal library placed in a
non-standard path (e.g. $out/lib/gnome-shell), the scanner needs
to be informed. For autotools-based apps, the full path was
obtained from libtool-wrapped files; with Meson, this is no longer
possible – we need to pass the path information in some other way.

This commit channels the --fallback-library-path option added
to g-ir-scanner in aforementioned patch.
2017-11-09 21:21:00 +01:00
Shea Levy 9e37df185c
fwupd: Remove manual rpath settings now that meson is fixed.
Thanks @yegortimoshenko!
2017-10-29 14:42:55 -04:00
Yegor Timoshenko 8f95aef531 meson: do not strip RPATH
https://github.com/NixOS/nixpkgs/pull/28444#issuecomment-324033323
2017-10-15 12:13:58 -05:00
Jan Tojnar 15c34cf1d8
meson: 0.42.1 → 0.43.0 2017-10-10 23:11:38 +02:00
Jan Tojnar ad8e4c272a
meson: 0.41.2 → 0.42.1 2017-09-13 22:37:30 +02:00
Lukas Werling f0a1ab78b4 meson/ninja: add setup hooks ()
* Add setupHook for meson/ninja build

* libhttpseverywhere: Use meson/ninja setupHooks

* jamomacore: Remove superfluous ninja buildInput

* Remove obsolete ninja buildPhases

These are all handled by ninja's setup hook.

* lean2, xcbuild: fix build with ninja setup hook

Ninja is a runtime dependency here. However, cmake can generate Ninja
build files as well to satisfy the setup hook.

* qtwebengine: fix build with ninja setup hook
2017-08-27 19:42:21 +02:00
mimadrid 4fb22bb622
meson: 0.40.0 -> 0.41.2 2017-08-15 11:54:43 +02:00
Jörg Thalheim 0ee8160aa4
meson: 0.35.0 -> 0.40.0
In configured builds other tools tries to call meson by directly
passing meson tools directly to python. Since they were shell scripts
due wrapping this failed
2017-04-26 16:41:49 +02:00
sternenseemann 2dca4f7ded meson: 0.32.0 -> 0.35.0 2016-10-10 16:03:33 +02:00
Alexey Shmalko a18abd2aa3 meson: 0.26.0 -> 0.32.0 2016-07-24 00:34:19 +02:00
Bjørn Forsman 2fb4b797a1 meson: add meta.platforms 2016-05-25 21:18:48 +02:00
Bjørn Forsman a35874b41a meson: fix chroot build
/usr/bin/env is not available in chroot builds. Invoke the python3
interpreter directly instead of trying to let env do it (which fails).

Fixes this build error:

  $ nix-build -A meson
  ...
  /nix/store/HASH-stdenv/setup: ./install_meson.py: /usr/bin/env: bad interpreter: No such file or directory
  builder for ‘/nix/store/HASH-meson-0.26.0.drv’ failed with exit code 126
2016-05-25 21:18:48 +02:00
Cillian de Róiste e42e4cfbd9 Meson: tidy up, untabify 2015-10-24 12:50:15 +02:00
Brandon Edens 6774b09af7 Add meson build system package. 2015-10-21 09:08:48 -07:00