Commit graph

50 commits

Author SHA1 Message Date
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 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
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
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
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
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
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 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +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
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
Vladimír Čunát 17a3f6a6fa icu: split into multiple outputs 2015-10-13 20:18:44 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Vincent Laporte 7cf05bfe71 boost: use ${python.interpreter} rather than ${python}/bin/python 2015-04-25 22:35:25 +02:00
Vladimír Čunát ec6cb5742b boost: fix build; outputs seem same as on master 2015-04-19 15:15:09 +02:00
Dan Peebles b0e1db1159 Fix boost 1.55 on clang (1.56 onwards already have the fix)
See https://trac.macports.org/ticket/42282 for more.
2015-02-08 22:19:04 -05:00
William A. Kennington III 07e80c6d98 boost: Add dependency fix for ipp files 2014-11-21 16:11:21 -08:00
William A. Kennington III 69bf3bd070 Merge pull request #4800 from aherrmann/pr_boost_mpi
boost 1.55: Add Boost.MPI (optional)
2014-11-15 00:59:49 -08:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Eelco Dolstra 19ea871862 boost: Fix building on Darwin 2014-11-11 10:17:08 -05:00
William A. Kennington III 83cecbdcbc boost: Fix runtime dependencies in fixup instead of using a hook to fix binaries 2014-11-10 13:15:37 -08:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Andreas Herrmann fe3267ac39 boost: Add optional Boost.MPI support
Boost.MPI is a C++ interface library to the
message passing interface (MPI) standard.
2014-11-05 10:39:34 +01:00
Michael Raskin 18ac683bbc Fix Boost 1.55 build 2014-11-04 15:21:33 +03:00
John Wiegley a4ee94b741 boost: correct the install names for darwin
This also makes the recent change for ledger unnecessary.
2014-11-04 02:28:35 -06:00
William A. Kennington III 8d605dafc6 boost: Pass arguments to generic.nix 2014-11-03 11:14:08 -08:00
William A. Kennington III 09d970ce12 boost: Remove dependencies on boost-dev 2014-11-02 17:22:27 -08:00
William A. Kennington III af8654db27 boost: Refactor into generic.nix 2014-11-02 17:22:27 -08:00