Commit graph

280 commits

Author SHA1 Message Date
Bouke van der Bijl ab04f4777b boost: add zstd and lzma support
The boost iostreams library supports zstd and lzma compression if it can
find the packages: https://www.boost.org/doc/libs/1_79_0/libs/iostreams/doc/installation.html
2023-02-02 10:55:16 +01:00
Shawn8901 a59dda942c treewide: remove global with lib; statements in pkgs/development 2023-01-26 18:31:02 +01:00
Sandro 1292c04563
Merge pull request #208210 from wegank/boost-181-init 2023-01-08 23:47:46 +01:00
Weijia Wang 436c5f8dc2 boost159, boost160: drop 2023-01-01 22:16:22 +01:00
Weijia Wang 6463ec06e3 boost181: init at 1.81.0 2022-12-29 10:29:26 +01:00
oxalica 06c0cce0e5 boost: add configurable enableIcu flag
This makes it easier to disable ICU support with `override`, where
the closure size matters.
2022-12-09 02:56:38 +08:00
Ben Wolsieffer aa1b96ff78 boost: enable cross-compiling Boost.Python
Explicitly tell Boost where to find Python, so Boost.Python can build be cross-
compiled.
2022-11-11 17:29:53 -05:00
Alex Wied aa473065cb boost180: init at 1.80.0 2022-10-24 15:01:47 -04:00
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
61d9f201baeef4c4bb91ad8a8f5f89b747e0dfe4 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
Pavol Rusnak 1aa1cf03b6 boost: use jfrog mirror instead of bintray
See https://www.boost.org/users/news/boost_has_moved_downloads_to_jfr.html
for more info
2022-06-20 19:04:03 +02:00
Alex Wied 8d8327c1cc boost179: init at 1.79.0 2022-05-12 10:43:06 -04:00
Andrew Childs de396a3c0a boost159: fix build on aarch64-darwin 2022-05-08 22:22:22 +03: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
Vladimír Čunát a1c53b6cdd
Merge #161568: boost178: init at 1.78.0
This was merged to `staging` already, but that's just unnecessary delay
after the PR was amended not to change boost defaults.
2022-04-10 10:56:13 +02:00
wheelsandmetal 4de2c2a00c boost178: init at 1.78.0 2022-03-31 12:36:50 +01:00
github-actions[bot] c6dd9fd65d
Merge master into staging-next 2022-03-25 18:01:14 +00: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
github-actions[bot] c80dabe3b1
Merge staging-next into staging 2022-03-23 06:01:55 +00: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
Maximilian Bosch f363b7c5df
boost1{69,70,72}: fix build w/glibc-2.34
To quote the release-notes[1]:

> When _DYNAMIC_STACK_SIZE_SOURCE or _GNU_SOURCE are defined,
> PTHREAD_STACK_MIN is no longer constant and is redefined to
> sysconf(_SC_THREAD_STACK_MIN).  This supports dynamic sized register
> sets for modern architectural features like Arm SVE.

This basically means that if the above applies, `#if PTHREAD_STACK_MIN > 0`
won't compile anymore because `PTHREAD_STACK_MIN` isn't a hard-coded
number, but `__sysconf (__SC_THREAD_STACK_MIN_VALUE)`[2].

The issue (for 1.69, 1.70, 1.72 - the other versions seem OK) was
reported upstream, but only for Solaris[3], however the corresponding
patches[4] seem to work as well for us.

Failing Hydra build: https://hydra.nixos.org/build/150926294

[1] https://sourceware.org/pipermail/libc-alpha/2021-August/129718.html
[2] See `${pkgs.glibc.dev}/include/bits/pthread_stack_min-dynamic.h`
[3] https://github.com/boostorg/thread/issues/283
[4] https://github.com/conan-io/conan-center-index/pull/361
2022-02-27 10:25:35 +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
Alyssa Ross f404068903
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/servers/search/groonga/default.nix
2021-12-02 14:52:44 +00:00
Hunter Jones b952a9b16e adopt multiple packages 2021-12-01 22:04:14 -06:00
Peter Simons 84f26a482a
Merge pull request #138309 from hjones2199/boostup
[staging] boost: default to boost 1.77 and refactor
2021-11-27 12:14:05 +01: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
Hunter Jones eca50883fc boost: default to boost 1.77 2021-09-17 12:47:21 -05:00
Hunter Jones 2e34bfb45a boost: generalize version numbers 2021-09-17 12:06:17 -05:00
Jan Tojnar 7a04c2ad68 Merge branch 'staging-next' into staging
- boost 171 removed on staging-next
- re-generated node-packages.nix

; Conflicts:
;	pkgs/development/java-modules/m2install.nix
;	pkgs/development/node-packages/node-packages.nix
;	pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
Daniel Nagy 052afa73a8
boost171: remove 2021-08-20 10:23:07 +02:00
John Ericson 904625852d pkgsStatic: Inline more of static overlay 2021-08-19 21:55:06 +00:00
Jan Tojnar e286e1cfa0 Merge branch 'staging-next' into staging
- boost 167 removed on staging-next (7915d1e03f) × boost attributes are inherited on staging (d20aa4955d)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507) × hardened kernels are versioned on staging (a5341beb78) + removed linux_5_12 (e55554491d)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
Doron Behar 7915d1e03f
Merge pull request #126398 from nagy/boost-167-remove
boost167: remove
2021-08-16 11:18:00 +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