Commit graph

188 commits

Author SHA1 Message Date
Samuel Dionne-Riel 3c38cc8058
Merge pull request #51813 from samueldr/aarch64/disable-non-arm-builds-part-1
aarch64: ZHF for aarch64 (1/??)
2018-12-20 21:06:52 -05:00
Will Dietz 28d85b274d boost169: init (at 1.69) 2018-12-16 23:02:16 -06:00
Samuel Dionne-Riel 3487ff99da boost: Fixes disabling for aarch64-linux for <1.59
Between 2b450377bf and the current
revision, the semantics behind "platforms" changed, and removing the
"aarch64-linux" string doesn't work anymore to filter it out.

Instead, blacklist the platform using the (comparatively) new
badPlatforms.
2018-12-10 14:55:20 -05:00
Matthew Bauer e3de8a9232 boost: use correct c compiler for bootstrapping
we need a c compiler that runs on the build machine for boost to work
2018-10-17 14:10:49 -05:00
Matthew Bauer a5de0ca963 treewide: preserve hashes
avoid mass rebuild from the last commits
2018-10-16 23:19:34 -05:00
Matthew Bauer 007faf02ca boost: use correct platform
"platforms.all" could include any possible os (even a machine with no
OS at all!). We can’t possible hope to support all of that, so need to
be more specific.
2018-10-16 22:03:09 -05:00
Matthew Bauer 0397453f1a boost: remove broken patch
the boost url is broken - remove for now
2018-10-16 21:51:48 -05:00
Milan Svoboda da4813072f boost: fix fiber header (#47540)
include/boost/fiber/detail/context_spmc_queue.hpp:1:1: error: stray ‘\357’ in program
caused by a leftover UTF-8 Byte Order Mark
2018-10-01 23:07:31 +02:00
Andrew Dunham ba278c3b87 boost: limit concurrent jobs to the maximum supported number (#47255) 2018-09-24 18:21:16 +02:00
Vladimír Čunát 2d6179d1e8
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
2018-09-01 17:38:18 +02: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
Stephen 775d1ecf57 boost: disable python explicitly in b2Args (#45679)
(cherry picked from commit 3b862a638952c814c49291ca3efa13e8363c77a2)
2018-08-28 00:01:09 +02:00
Will Dietz 1f723abfac boost168: init
Drop patch from 1.67 that's already included.
2018-08-22 10:21:44 -05:00
Frederik Rietdijk 099c13da1b Merge staging-next into master (#44009)
* 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 #40273

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 #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Daiderd Jordan bce4388874
boost: disable system Python.framework detection
There doesn't seem to be a --without-python flag and since the system
framework is always available the build tries to enable python support
while we have it disabled by default and explicitly don't pass in the
python headers.
2018-07-03 21:08:46 +02:00
Eelco Dolstra 772eef9168 boost: Disable Python / Numpy support by default
We can't have a C++ library pulling in Numpy and its gazillion
dependencies by default.
2018-07-01 19:13:57 +02:00
Matthew Bauer f45211bd6d boost: use standardized system information 2018-06-23 22:43:05 -04:00
Matthew Bauer 798ad38c35 boost: use default toolset option
for 1.66 & 1.67 we were overriding the default toolset option. This
meant that gcc-cross was not being selected properly, breaking the
cross toolchain.

/cc @dtzWill
2018-06-23 13:40:18 -04:00
Will Dietz 587b1b77f2 boost 1.67 (#41258) 2018-06-03 12:18:25 +00:00
tkatchev c1127b95ce boost: Fix static library builds. (link=static and runtime-link=static together breaks Boost's build scripts.) 2018-03-22 15:51:23 +03:00
Shea Levy 1f2701379a
boost: Fix cross-compilation 2018-02-28 15:01:31 -05:00
Eelco Dolstra c08e4b9102
boost: Don't store absolute path in #line
This causes packages to have boost.dev in their runtime closures, via
assertion messages.

Fixes #34462.
2018-02-05 21:56:43 +01:00
Bojan Nikolic 35462db2e3 Correct boost configure phase when enablePython is false
The bootstrap script does not seem to have --without-python; instead
just omit --with-python option
2018-01-03 16:57:49 -05:00
Bojan Nikolic 00b038a3f8 boost: Do not force numpy support from 1.65
The reason is that if cross compiling (or for other reasons) python
bindings as a whole are turned off. Those two lines then trigger
assertion errors unless manually overridden for cross compilation.

This way:

 1. The `enableNumpy` default respects the `enablePython deafult.
 2. Cross works by default
 3. Absurd manual overrides still break as they should
 4. The `>= 1.65` logic is direct and not a maintaince gotcha.
2018-01-02 19:31:25 -05:00
John Ericson da48603852
Merge pull request #33188 from obsidiansystems/clean-boost
boost: Clean, reducing duplication
2017-12-30 19:29:03 -05:00
John Ericson 76b590405a boost: Clean, reducing duplication
This was motivated originally by my cross work, but that goal requires a
few more commits to other things. Still, it's good to start the cleanup
now / get things out of the way.
2017-12-30 19:17:53 -05:00
Frederik Rietdijk 0e37a2cc98 boost165: make it possible to build without numpy 2017-12-22 09:24:34 +01:00
Tristan Carel d8a1b34c8e boost166: init at 1.66.0 2017-12-22 09:24:34 +01:00
Tristan Carel 19dbfb66c0 boost: build Python numpy extension by default
In order to manipulate Python arrays numpy is needed from boost 1.65 on.
http://www.boost.org/users/history/version_1_65_1.html
2017-12-12 21:02:32 +01:00
John Ericson e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
adisbladis d99378654f pythonPackages: Add version and pname attributes to packages 2017-11-23 17:49:43 +01:00
Nikolay Amiantov b1e499788c boost: add numpy support
Not built by default.

Also add enablePython flag (enabled by default) and cleanup a bit.
2017-10-17 03:40:11 +03:00
Nikolay Amiantov 23ea2e931f boost165: init at 1.65.1 2017-10-17 03:39:50 +03:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Nikolay Amiantov 0a7f2acb17 boost164: init at 1.64.0 2017-07-26 18:36:52 +03:00
hsloan df8c390a5a boost: Don't use stdenv ? cross 2017-06-28 19:29:03 -04:00
John Ericson fcef0add76 boost: Don't use stdenv.cross, and utilize new platform metadata 2017-06-28 18:21:06 -04:00
Tuomas Tynkkynen 2b450377bf boost155: Not supported on aarch64 2017-03-10 20:06:34 +02:00
Ilya Kolpakov 6d8235210d boost: 1.63.0 (not default) 2017-02-15 18:29:39 +01:00
Aristid Breitkreuz cc30f5dd5e boost: add 1.62.0 (not default yet) 2016-12-19 16:00:46 +01:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Vladimír Čunát 4e6b45d0a0 Merge branch 'master' into staging
... to get the ffmpeg changes which cause nontrivial rebuilds.
2016-05-17 11:46:37 +02:00
Vladimír Čunát 604b0c86bf boost: fix build on mingw after b465dc202f
We passed bogus --libdir even in standard native builds;
apparently it wasn't a problem, but I also fixed that.
2016-05-17 10:41:06 +02:00
Peter Simons 385b21c92d boost/generic.nix: fix Emacs syntax highlighting (cosmetic) 2016-05-16 22:49:55 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Tuomas Tynkkynen b465dc202f boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Vladimír Čunát 1bfc3a8965 boost: support libiconv, also on non-glibc platforms 2016-04-23 10:52:07 +02:00
Vladimír Čunát 2b0d725854 boost: finish fixes for mingw
- Dynamic linking won't work, it seems.
- When using a native python, the extension isn't built,
  so let's not depend on it.
- Replace flags missing on this branch, such as `isCrossWin`.
2016-04-23 10:52:07 +02:00
aszlig fb74d901d7 boost: Add patch for mingw to use gas instead.
The upstream sources only compile with masm, so we need to add a patch
that translates the masm sources to GNU assembler. Unfortunately, this
means, that "generic.nix" is no longer very much generic, but the
versions we currently include work fine with the patch.

Unfortunately, the boost build still doesn't finish, but we're getting
there soon enough.

The patch is from https://svn.boost.org/trac/boost/ticket/7262 and
following the discussion it seems that the upstream authors are
unwilling to add a gas version for the Windows platform. So in the long
term we might need to find a better solution to that, like for example
using Wine to run MASM.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:07 +02:00