Commit Graph

172 Commits

Author SHA1 Message Date
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
aszlig
5f0f48c08b boost: Reduce noise during cross compile.
I guess the "set -x" was only left there for debugging, so I'm removing
it because it let's the scrollback buffer explode ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:06 +02:00
aszlig
2d760a28b3 boost: Supply some configure flags for mingw.
Otherwise, Boost.Build is trying to compile against pthread and
desperately searches for icu/iconv.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:06 +02:00
aszlig
ad033f7665 boost: Fix generation of crossB2Args.
`concatMapStringsSep` actually needs a function to work on the list
items, but it was probably a leftover from the refactor in af8654d.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:06 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Peter Simons
73f53ddf9c Merge pull request #11878 from lancelotsix/update_boost
pkgs.boost: 1.59 -> 1.60
2016-03-17 19:45:44 +01:00
Michael Raitza
f7bf249b2b boost: Fix compilation for static builds.
The 'runtime-link=' feature must not be set in addition to 'link='
for boost-1.55 when building only the statically linked libraries.
Fixes errors that targets were defined multiple times.
2016-03-08 10:04:04 +00:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tobias Geerinckx-Rice
32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Lancelot SIX
aa89e98474 pkgs.boost: 1.59 -> 1.60
See http://www.boost.org/users/history/version_1_60_0.html
2016-01-15 13:25:25 +01:00
janus
55aa9163cc FreeBSD: minor fixes, add notes and make stdenv more robust 2016-01-01 17:01:13 +00:00
janus
3cb831d2bc FreeBSD patches for miniupnpc, boost, bitcoin 2016-01-01 16:59:48 +00:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
John Wiegley
22392d8134 Correction to Boost RPATH for Darwin systems 2015-10-31 09:35:06 -07:00
Vladimír Čunát
dd915f82e7 expat: split dev output 2015-10-28 10:09:34 +01:00