Commit Graph

331 Commits

Author SHA1 Message Date
Martin Weinelt
450b9c2628
Merge pull request #220364 from hesiod/cmake-3_25_3
cmake: 3.25.2 -> 3.25.3
2023-03-15 20:21:39 +00:00
Martin Weinelt
19680e9902
Merge pull request #217568 from trofi/stdenv-parallel-install
stdenv/generic/setup.sh: enable parallel installs for parallel builds
2023-03-15 17:10:19 +00:00
Tobias Markus
a16f3e6b38 cmake: 3.25.2 -> 3.25.3 2023-03-09 18:31:18 +01:00
Sergei Trofimovich
69cf5181c3 stdenv/generic/setup.sh: enable parallel installs by default
The primary motivating example is openssl:

Before the change full package build took 1m54s minutes.
After the change full package build takes 59s.

About a 2x speedup.

The difference is visible because openssl builds hundreds of manpages
spawning a perl process per manual in `install` phase. Such a workload
is very easy to parallelize.

Another example would be `autotools`+`libtool` based build system where
install step requires relinking. The more binaries there are to relink
the more gain it will be to do it in parallel.

The change enables parallel installs by default only for buiilds that
already have parallel builds enabled. There is a high chance those build
systems already handle parallelism well but some packages will fail.

Consistently propagated the enableParallelBuilding to:
- cmake (enabled by default, similar to builds)
- ninja (set parallelism explicitly, don't rely on default)
- bmake (enable when requested)
- scons (enable when requested)
- meson (set parallelism explicitly, don't rely on default)
- waf (set parallelism explicitly, don't rely on default)
- qmake-4/5/6 (enable by default, similar to builds)
- xorg (always enable, similar to builds)
2023-02-26 22:02:09 +00:00
Guillaume Racicot
fa65b293a9
cmake: 3.25.1 -> 3.25.2 2023-02-18 00:28:08 +01:00
Anderson Torres
809f21a32f cmake: 3.24.3 -> 3.25.1 2023-01-28 15:24:14 -03:00
AndersonTorres
568e01e675 cmake: incorporate darwin and libsForQt5 into its expression 2022-12-12 16:50:49 -03:00
Vladimír Čunát
1462b5397b
Merge #199277: cmake: 3.24.2 -> 3.24.3
...into staging
2022-11-10 22:10:44 +01:00
Bernardo Meurer
1c0ceeaf2e
Merge pull request #192943 from KiruyaMomochi/cmake 2022-11-03 09:19:46 +00:00
R. Ryantm
edd361904b cmake: 3.24.2 -> 3.24.3 2022-11-03 01:04:32 +00:00
百地 希留耶
5245e7324b
cmake: put the DEFINED check in the same if-statement 2022-11-02 02:26:33 +08:00
百地 希留耶
7a9d47dea6
cmake: check for $ENV{NIX_CC} with quotes
Fixes #194929
2022-10-15 16:09:03 +08:00
=
7bec82f49e
cmake: check if NIX_CC exists before using it 2022-09-26 04:58:51 +08:00
Thomas Tuegel
cedd23b215
Merge pull request #191281 from r-ryantm/auto-update/cmake
cmake: 3.24.1 -> 3.24.2
2022-09-21 10:39:59 -05:00
R. Ryantm
d2749ccd12 cmake: 3.24.1 -> 3.24.2 2022-09-15 07:47:03 +00:00
Artturin
b1149dc303 cmake: add check-pc-files hook to check broken pc files
see nixpkgs pr 172150
2022-09-08 21:27:47 +03:00
Vladimír Čunát
47cfdd695f
Merge #187582: cmake: 3.24.0 -> 3.24.1 (into staging) 2022-08-25 13:35:59 +02:00
Sergei Trofimovich
da0a5e5f3b cmake: fix crash on CC without libc support
Without this change pkgsLLVM fails to build any packages
as compiler-rt fails early in cmake:

    CMake Error at ...-cmake-3.24.0/share/cmake-3.24/Modules/Platform/UnixPaths.cmake:53 (file):
      file STRINGS file
      "...-x86_64-unknown-linux-gnu-clang-wrapper-11.1.0/nix-support/orig-libc-dev"
      cannot be read.

It's a regression caused by 871cf9f7b3 "cmake: detect libc location
at runtime #181431" where we started using `orig-libc-dev` as a libc pointer.

During pkgsLLVM pootstrap first compiler has no libc support yet.

The change skips runtime detection if there are no libc signs.
2022-08-21 19:18:11 +01:00
R. Ryantm
410a9ae700 cmake: 3.24.0 -> 3.24.1 2022-08-20 10:52:56 +00:00
github-actions[bot]
28612f43c8
Merge master into staging-next 2022-08-18 12:01:28 +00:00
Nick Cao
ef640cb346
Revert "cmake_3_23: bring this version back (temporarily, I hope)"
This reverts commit 8334328f11.
2022-08-16 21:59:20 +08:00
Vladimír Čunát
4a944dfeac
Merge branch 'staging' into staging-next 2022-08-16 13:12:47 +02:00
Vladimír Čunát
8334328f11
cmake_3_23: bring this version back (temporarily, I hope) 2022-08-16 10:40:27 +02:00
Anderson Torres
a1d622bf68
Merge pull request #181431 from stephank/feat/cmake-libc
cmake: detect libc location at runtime
2022-08-12 17:07:06 -03:00
Jonathan Ringer
b34a4df857
[staging] cmake: 3.23.3 -> 3.24.0 2022-08-05 11:32:50 -07:00
Sandro
7d311bd0c9
Merge pull request #183982 from r-ryantm/auto-update/cmake 2022-08-05 19:35:10 +02:00
Jonathan Ringer
3d17b4c305
cmake/setup.sh: allow for cmakeBuildDir to be configured 2022-08-02 14:19:33 -07:00
R. Ryantm
a4cfeb7cf1 cmake: 3.23.2 -> 3.23.3 2022-07-30 15:22:57 +00:00
Stéphan Kochen
871cf9f7b3 cmake: detect libc location at runtime 2022-07-14 07:08:57 +02:00
Josef Kemetmüller
f7414e2b3a cmake/setup-hook.sh: Don't skip build-RPATH
This should simplify using `nix-shell -A` or `nix develop` to develop
CMake based projects. CMake features a mechanism to use a different
RPATH for all executables in the build directory and only rewrite these
RPATHs on installation. This makes it possible to run executables
already from the build directory without having to set LD_LIBRARY_PATH.
This should simplify the checkPhase for cmake based projects and
hopefully not break anything.

Fixes: #22060
2022-07-04 02:58:50 +03:00
Vladimír Čunát
aab2ab55a4
Merge #167671: cmake: Fix a darwin-specific patch
...into staging-next.  I assume that applying on non-Darwin was
just temporary for testing, so I cut that part to avoid rebuilds.
2022-07-02 15:30:32 +02:00
R. Ryantm
54a65b5cd5
cmake: Fix darwin-specific remove-systemconfiguration-dep patch
Unbreaks cmakeMinimal on darwin.

Co-authored-by: Ryan Burns <rtburns@protonmail.com>
2022-06-27 23:54:11 +08:00
AndersonTorres
fc881d3a4b cmake: 3.22.3 -> 3.23.2 2022-06-22 22:11:27 -03:00
AndersonTorres
cd39674dc0 cmake: add myself as maintainer 2022-06-22 22:11:27 -03:00
AndersonTorres
02155ca916 cmake: rename patches
Because it is easier to look at them as a block, not polluting the directory
listing so much.
2022-06-22 22:11:09 -03:00
AndersonTorres
d6f12ab2f6 cmake: use a list of suitable uiToolkits instead of Boolean values
Also, aborts when the list contains anything besides the acceptable options.
2022-06-22 21:52:07 -03:00
AndersonTorres
033cfacaf2 cmake: reformat expression 2022-06-21 23:04:07 -03:00
Rick van Schijndel
010f6ee30d
treewide: mark broken for darwin 2022-05-30 13:42:58 +02:00
R. Ryantm
28b3e0a8a0 cmake: 3.22.2 -> 3.22.3 2022-03-05 15:48:05 +00:00
Sandro Jäckel
29c409f824 cmake: 3.22.1 -> 3.22.2 2022-02-01 10:54:38 -08:00
ajs124
5161de0a1e cmake_2_8: drop 2022-01-21 03:45:24 +01:00
Sergei Trofimovich
653ff61cb6
cmake: 3.21.2 -> 3.22.1 (#147818)
https://cmake.org/cmake/help/latest/release/3.22.html

Co-authored-by: Winter <winter@winter.cafe>
2021-12-25 17:06:52 -05:00
Felix Buehler
7678aa30b4 pkgs/development: rename name to pname&version 2021-11-30 21:32:28 +01:00
toonn
982f7228ff cmake: Temporarily pass flags
To mimic LLVM 7 behavior we need to pass `-Wno-elaborated-enum-base` in
`CXXFLAGS`. Ideally this gets fixed upstream and won't be necessary.
2021-11-24 15:17:13 -08:00
Luke Granger-Brown
a8be3a74cc cmake: revert cmake support for 10.4 Tiger
This is a reversed patch of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6426.

_CURRENT_OSX_VERSION isn't set properly, which causes this condition to fail,
which means we don't get CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG which means
we can't compile libcxx. Ugh.
2021-09-11 15:12:21 +01:00
Luke Granger-Brown
daa1175255 cmake: 3.21.1 -> 3.21.2
3.21.1 has a bug which causes darktable to fail to compile (passes weird
  arguments to ar in the ninja-generated files), which is fixed in
  3.21.2.
2021-09-11 03:24:26 +00: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
Sebastián Mancilla
8f94a33b38 treewide: ensure pre/post phase hooks are strings
Some derivations use lib.optional or lib.optionals when setting pre/post
phase hooks. Ensure the proper lib.optionalString is used.
2021-08-20 19:08:42 -04:00
Tobias Mayer
4aac491f18 cmake: Fix on darwin-arm64
Adds the SystemConfiguration framework to buildInputs unless we're
bootstrapping.

For the bootstrap version, we revert
31f631a142
instead so CMake builds without SystemConfiguration.
2021-08-12 11:26:13 +02:00
tobim
12da67f0c6 cmake: 3.21.0 -> 3.21.1 2021-08-12 11:26:13 +02:00