diff options
| author | fanquake <fanquake@gmail.com> | 2024-04-05 15:05:50 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-04-05 15:10:14 +0100 |
| commit | eb78ebc064b8d7fdd605e184efb6b45a53b2c6d5 (patch) | |
| tree | b504d827deaef08485bf4455b0f393614547bd56 /contrib/guix | |
| parent | 5a5ab1d5446693ee2655860c2f2920bcc3389c83 (diff) | |
| parent | 007ea322a6492d46f1565ef58a0c49f5b468ff20 (diff) | |
Merge bitcoin/bitcoin#29725: depends: build libqrencode with CMake
007ea322a6492d46f1565ef58a0c49f5b468ff20 depends: switch to building libqrencode with CMake (fanquake)
884330c0a57ce839d48606dc2de3928869b31b7d guix: make cmake-minimal a global requirement (fanquake)
Pull request description:
Switch to building libqrencode with CMake. Note that upstream (https://github.com/fukuchi/libqrencode) hasn't seen any activity for ~4 years, so the odds of getting anything upstream seems low, but I've made two minor changes to the source here, which I will PR in any case.
From an initial look I couldn't find any significant difference between the Autotools and CMake produced libs. As part of this change we move cmake-minimal in Guix into the global package set.
ACKs for top commit:
TheCharlatan:
ACK 007ea322a6492d46f1565ef58a0c49f5b468ff20
Tree-SHA512: c784f790ddea958082c8ae96d3744bdf99331a8799765f9d44f00861b8e2cfcab1a88a3d64af5b10e51a8d5938d55eb6a3d271790b565e50492a39d00dc0e30f
Diffstat (limited to 'contrib/guix')
| -rw-r--r-- | contrib/guix/manifest.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 8f0147743d..87dcf49bcb 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -500,6 +500,7 @@ inspecting signatures in Mach-O binaries.") gzip xz ;; Build tools + cmake-minimal gnu-make libtool autoconf-2.71 @@ -532,7 +533,6 @@ inspecting signatures in Mach-O binaries.") gcc-toolchain-11 binutils clang-toolchain-17 - cmake-minimal python-signapple zip)) (else '()))))) |