Commit Graph

114 Commits

Author SHA1 Message Date
github-actions[bot]
aac580f88f
Merge master into staging-next 2022-10-20 00:05:13 +00:00
Adam Joseph
2df2b52806 boost/generic.nix: reference commit-hash in comment
The explanation for the conditional introduced by
61d9f201ba is longer than a reasonable
inline comment should be.  It directed the reader to use `git blame`,
but that tends to bitrot.  Let's point the user to a specific nixpkgs
git hash.

This commit cannot be squashed into the previous commit, because a
commit cannot mention its own commit-hash (without performaing an
expensive double-sha1 preimage attack, of course).
2022-10-19 20:22:45 +02:00
Adam Joseph
ac92b409b3 boost: if isMips use the "cross compile" codepath unconditionally
boost-context changed its name for mips from "mips1" to "mips" in this
commit:

  6edc8184a7

however the native-build code to detect the local architecture still
reports "mips1":

  67c074b249/boostcpp.jam (L637)

Therefore native builds of boost-context on mips must specify
architecture= explicitly; without this you will get link failures
"undefined reference to `jump_fcontext`" in code that uses
boost-context.

Currently the "cross compile" codepath, which provides explicit
architecture/abi/address-model/binary-format/os parameters, is
prefixed by this comment:

```
  # TODO: make this unconditional
```

This commit does so, at least if `isMips`.

This commit is needed in order for native builds of nix to succeed on
mips.
2022-10-19 20:22:45 +02:00
github-actions[bot]
ab4849492d
Merge master into staging-next 2022-10-17 06:24:16 +00:00
Ryan Burns
8b08189c61
Merge pull request #196244 from r-burns/boost-s390x
boost: support s390x
2022-10-16 22:48:36 -07:00
Ryan Burns
cc390e2ded boost: support s390x
s390x will return s390 as its cpu family,
but boost does not have generic s390 support, only s390x.
Add a special case to build for s390x architecture
2022-10-16 00:25:31 -07:00
Ryan Burns
bbe814352f boost: disable pch for darwin -> linux cross
PCH breaks the build when cross-compiling from darwin to linux.
Should fix a good number of our cross-trunk hydra builds.
2022-10-14 17:10:57 -07:00
Martin Weinelt
195aa5887d
boost: fix build with enablePython by passing libxcrypt 2022-10-09 18:14:36 +02:00
github-actions[bot]
48a7b8564d
Merge staging-next into staging 2022-09-01 06:07:49 +00:00
Nicolas Benes
9a3d274dd6 boost155: remove 2022-08-31 18:50:53 +02:00
Yves Fischer
9e77929f19 boost: allow enablePython in cross compilation 2022-08-25 23:26:51 +02:00
Janne Heß
c911240e9c
Revert "Add mingwW64-llvm cross-system." 2022-05-18 13:50:23 +02:00
Shea Levy
0f68ed163c
Merge branch 'mingwW64-clang' into staging 2022-05-18 06:30:21 -04:00
Andrew Childs
de396a3c0a boost159: fix build on aarch64-darwin 2022-05-08 22:22:22 +03:00
Shea Levy
504d38ae7b
cross: Allow Windows toolchains to use ucrt as libc. 2022-05-06 10:54:52 -04:00
Anders Kaseorg
6920d8ca42 treewide: Simplify negated uses of versionAtLeast, versionOlder
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2022-04-25 13:35:24 -07:00
Adam Joseph
5952698e53 boost: fix taxonomy mistake, account taxonomy change in v1.78
This commit makes two changes:

1. Boost changed its taxonomy for architecture names between the 1.77 and
   1.78 releases, in this commit:

   6edc8184a7

2. During the review of #161162 I [was asked about][1] the source of
   the [mips64-context.patch][2] that I had included in the original
   version of the PR.  I searched through the boost-context revision
   history and found [a nearly identical patch][3], which I
   substituted in the final, merged version of the PR.

   As it turns out, my [mips64-context.patch][2] was an earlier
   revision of what was eventually accepted to boost-context.  The
   only difference between the two patches is the name they use:
   mips64 vs mips1.

   When switching to the accepted version of the boost patch, I should
   have also updated libraries/boost/generic.nix to change mips64 to
   mips1.  This commit does that.

[1]: https://github.com/NixOS/nixpkgs/pull/161162#discussion_r847903087
[2]: https://raw.githubusercontent.com/a-m-joseph/nixpkgs/1ca5025945470ce96408552b9117674b12efaf04/pkgs/development/libraries/boost/mips64-context.patch
[3]: e3f744a186.patch
2022-04-13 21:56:44 -07:00
Adam Joseph
1c51548468 boost: support for cross-compiling boost to a mips64 target
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-04-12 15:21:43 -07:00
Doro Rose
4a8f46f7ce boost: make boost work for static darwin builds
Prior needsUserConfig setting is unconditionally applied for darwin.
This is not valid for static builds and should only be set for dynamically linked darwin builds.
2022-04-10 20:51:12 +02:00
maralorn
0e0bb200ff
Merge pull request #165327 from ncfavier/fetchpatch-relative
fetchpatch: add `preIncludes` and `relative`
2022-03-25 16:32:14 +01:00
Naïm Favier
a6bc988f00
boost177: use fetchpatch's relative argument
We can drop `includes` since there's only one file in that directory.
2022-03-25 10:47:12 +01:00
Markus Wamser
713648a19b
boost: unbreak build for 1.65 and 1.66 (#163216)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-23 03:51:12 +01:00
Ryan Burns
c827d9df00
Merge pull request #153143 from r-burns/boost-no-atomics
[staging] boost177: fix on platforms without atomics
2022-02-16 18:55:03 -08:00
Andrew Childs
8668f940c5
boost: refine assertion requiring pth support in clang (#159990)
The pth feature was only used by boost's build with clang on linux,
and should not prevent building on darwin.
2022-02-14 22:02:36 -05:00
Ryan Burns
b906464824 boost177: fix on platforms without atomics
backport patch from boost178 to fix compilation when atomics are not available,
e.g. for armv5tel
2021-12-31 21:00:21 -08:00
Hunter Jones
b952a9b16e adopt multiple packages 2021-12-01 22:04:14 -06:00
Peter Simons
476635afe1 Drop myself from meta.maintainers for most packages.
I'd like to reduce the number of Github notifications and
review requests I receive.
2021-10-14 11:01:27 +02:00
John Ericson
904625852d pkgsStatic: Inline more of static overlay 2021-08-19 21:55:06 +00:00
sternenseemann
43e0f0688a boost: always set toolset for known compilers
There is an edge case when cross compiling where the auto detection
script would not correctly recognize the compiler (as it is only
good at recognizing native compilers, really, which we don't have
anymore since we don't need the build->build one anymore).

If bootstrap.sh doesn't detect the compiler correctly, it'll generate
a project-config.jam with a syntax error which breaks the build in a
hard to spot way: only a warning is displayed after configuring, the
build will appear to run normally until it fails quietly just before
installing. By providing it explicitly, we can prevent this.
2021-08-04 23:48:22 +02:00
sternenseemann
d20aa4955d boost*: use packaged b2 instead it of building in configurePhase
If we build two things in one derivation, it becomes more complicated
and its build time is extended. Therefore we should avoid this if
possible. There's a good opportunity for this with boost: We have
boost-build packaged already. This has the additional benefit that
we can get rid of $CC_FOR_BUILD entirely in boost, meaning we don't
need to rely on (as many) hacks to make boost understand our way of
cross compiling.

Unfortunately boost-build is not backwards compatible, so we need to
build a specific boost-build for each boost derivation (the number
could probably be reduced, but I'm not interested in testing a lot
of boost builds at the moment).

Additionally we fix a few cross compilation problems:

- boost couldn't cope with different types of compilers for native
  and cross (as happens if useLLVM is true). Since we only use one
  of them per derivation, this is no longer an issue.

- boost didn't find the cross ar and ranlib for compilation (since
  it doesn't check $AR or $RANLIB). Instead it used plain ar and
  ranlib form $PATH which were the native ones before. This is now
  fixed by setting these tools explicitly in user-config.jam (and
  no longer providing the native tools).

With these changes, pkgsLLVM.boost builds.

On darwin, instead of patching the clang-darwin.jam definition, we
instead supply -rpath $out/lib via <linkflags> which causes the
correct directory to be added to the libraries' rpaths, so that
they find each other.
2021-08-04 14:46:38 +02:00
Frederik Rietdijk
f887fbcaef boost: python is only used when called from python-packages.nix 2021-07-27 20:37:04 +02:00
oxalica
74e20c9b27 boost: fix cross-compile support 2021-03-03 18:14:24 -05:00
oxalica
9dd7348c04 boost: fix meta.badPlatforms 2021-03-03 18:14:24 -05:00
Markus Kowalewski
6dba41fbcb
mpi: use mpi attribute consistently as the default MPI implementations
Use the attribute mpi to provide a system wide default MPI
implementation. The default is openmpi (as before).
This now allows for overriding the MPI implentation by using
the overlay mechanism. Build all packages with mpich instead
of the default openmpi can now be achived like this:
self: super:
 {
   mpi = super.mpich;
 }

All derivations that have been using "mpi ? null" to provide optional
building with MPI have been change in the following way to allow for
optional builds with MPI:
{ ...
, mpi
, useMpi ? false
}
2021-01-23 12:15:13 +01:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
John Ericson
f52263ced0 treewide: Start to break up static overlay
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.

CC @FRidh @matthewbauer
2021-01-03 19:18:16 +00:00
Ryan Burns
ca89e801ea boost: fix segfaults on ppc64
Fixes https://github.com/NixOS/nix/issues/2517

See also:
https://github.com/boostorg/context/issues/72
https://github.com/boostorg/fiber/issues/193

These issues have been resolved by:
https://github.com/boostorg/context/pull/106
d4608a4e8b
which is merged into boost as of v1.71.0.

This feature was introduced (with the bug) in
boost v1.61 and was fixed in v1.71. So we apply
the patch to all versions in that range.
2020-10-22 01:11:21 -07:00
Daiderd Jordan
bb0b872b61
Merge pull request #100388 from thefloweringash/darwin-dylib-names-hook
treewide: move fixDarwinDylibNames to nativeBuildInputs
2020-10-21 19:25:48 +02:00
Andrew Childs
722d02a720 treewide: move fixDarwinDylibNames to nativeBuildInputs
This hook runs at build time and depends on executing
install_name_tool from binutils.
2020-10-21 13:26:53 +09:00
Rasmus Rendal
35e296f5e5 boost173: init at 1.73.0 2020-10-11 10:26:47 +02:00
TQ Hirsch
777df0b4a5 boost: Fix library and include paths in generated cmake files
Boost generates its installed cmake configuration using custom logic
in its own build system; while this logic *knows* where it should be
installed, the generated config overrides the correct information with
new paths based on the location of the cmake configuration file in an
attempt to let the package be relocated after installation.

This patch simply undoes that.
2020-04-14 23:41:10 +02:00
Holger Wünsche
556b0e89ca
boost: check clang version
boost <1.69 can't be compiled with clang >=8. This commit adds an assert
to catch the error early on.
2020-04-13 16:01:50 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Robin Gloster
e298629fec
boost: *Flags are lists 2019-12-30 11:13:39 +01:00
Pulkit Sinha
562db4bbf9
boost : extra arguments to b2
Certain boost features require compile time flags. For example -
https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/adv_scenarios/obsolete_init_func.html
https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/link_references/link_boost_test_no_main.html
https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/link_references/link_boost_test_dyn_link.html

This commit add the ability to specify arbitrary extra arguments to b2's arguments.
2019-11-29 13:17:59 -05:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Benjamin Hipple
3232cadf96 boost: run build and install hooks
Users who want to patch boost may put a postInstall hook in an overlay, which
requires that that expression runs them on the buildPhase and installPhase.
2019-05-24 17:46:46 -04:00
Matthew Bauer
da38a49a24 treewide: mark bad packages
Some old stuff is known not to work.
2019-04-26 21:55:11 -04:00
strager
153e7fca32 boost: fix 1.55 build on macOS (#59508)
darwin-no-system-python.patch does not apply cleany on Boost 1.55's
sources. Fix this patch file for Boost 1.55, making it build
successfully on macOS.
2019-04-16 03:11:01 -04:00
Jörg Thalheim
b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00