Skip to content

Conversation

fanquake
Copy link
Member

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.

@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 25, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK TheCharlatan

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #21778 (build: LLD based macOS toolchain by fanquake)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@fanquake fanquake force-pushed the libqrencode_cmake branch from 2e15b6f to 007ea32 Compare March 26, 2024 10:28
Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 007ea32

Guix builds (x86_64)

158bcb78ca2652a69a3974d1aa8bcf51018f8f1a80a61739a4e63b85ed829c4b  guix-build-007ea322a649/output/aarch64-linux-gnu/SHA256SUMS.part
b372f2cedab3320487a12d35ac3c5ce314b983659b59c4af9b124d6d4d140829  guix-build-007ea322a649/output/aarch64-linux-gnu/bitcoin-007ea322a649-aarch64-linux-gnu-debug.tar.gz
5d5890f0e1ef5203f116dd30542775645bcd169b00539a1f064b7b351219f942  guix-build-007ea322a649/output/aarch64-linux-gnu/bitcoin-007ea322a649-aarch64-linux-gnu.tar.gz
1e01981544d7c6299521514a90f97d7f5e57a266583db8f6dd44519cb8daf6d2  guix-build-007ea322a649/output/arm-linux-gnueabihf/SHA256SUMS.part
2440420e3812b05b24179e85e247460c9e9eb1152a0856325d09bfdba77bb25d  guix-build-007ea322a649/output/arm-linux-gnueabihf/bitcoin-007ea322a649-arm-linux-gnueabihf-debug.tar.gz
5bd50ccb716f04624d4beb89ae796a2fc487d04c07f0f93967863a5ee9009dd7  guix-build-007ea322a649/output/arm-linux-gnueabihf/bitcoin-007ea322a649-arm-linux-gnueabihf.tar.gz
a62bf84f681227012a1f4849f32ff33e4c18dd1be20409cf2ffd8775adfecc7e  guix-build-007ea322a649/output/arm64-apple-darwin/SHA256SUMS.part
410d7c0bc5c701310d3834185add4f4550f6d4c1ca9cb034ff26ba89f863bf81  guix-build-007ea322a649/output/arm64-apple-darwin/bitcoin-007ea322a649-arm64-apple-darwin-unsigned.tar.gz
70bfdda7b85c0c53e6ec7858787275367758473834727bb9fbb9984cd5436a3b  guix-build-007ea322a649/output/arm64-apple-darwin/bitcoin-007ea322a649-arm64-apple-darwin-unsigned.zip
6ab15eab9b54859b90b1d493631ee19270ea1d9b309eb1e6d8da74ba56d638cf  guix-build-007ea322a649/output/arm64-apple-darwin/bitcoin-007ea322a649-arm64-apple-darwin.tar.gz
fb5359705952f2f16c95dce9b28aa38188530a7002d6503aad292a9a9b76ee24  guix-build-007ea322a649/output/dist-archive/bitcoin-007ea322a649.tar.gz
4ad4948c691f35b513368740cff105866565afec60dc1013bee748071e4ff051  guix-build-007ea322a649/output/powerpc64-linux-gnu/SHA256SUMS.part
e3a78205bdfbf6ca41290cca0e6c6bf27ee61328a92c448fbb5966e514a1b449  guix-build-007ea322a649/output/powerpc64-linux-gnu/bitcoin-007ea322a649-powerpc64-linux-gnu-debug.tar.gz
0a0d2e0ada4486df2948d6ab51374f10f500a36fb0760f4c5aca796feb66b23d  guix-build-007ea322a649/output/powerpc64-linux-gnu/bitcoin-007ea322a649-powerpc64-linux-gnu.tar.gz
b1db2aefe009780bc7fa76b488cd5d6c7c5ff8b7663c0171cf755a83e9c4113f  guix-build-007ea322a649/output/riscv64-linux-gnu/SHA256SUMS.part
e3432926765170e2803b95930db62dfd0666a313a8614e3fb044720d44a399c1  guix-build-007ea322a649/output/riscv64-linux-gnu/bitcoin-007ea322a649-riscv64-linux-gnu-debug.tar.gz
2d265b9f32ff0a2f7efc7798bc66eba0d2126a684ff551642117797b27b4def1  guix-build-007ea322a649/output/riscv64-linux-gnu/bitcoin-007ea322a649-riscv64-linux-gnu.tar.gz
19a26c31d84c1b0a52f7aba473bde45e1410e39b081ed39f48f198d89bdf3222  guix-build-007ea322a649/output/x86_64-apple-darwin/SHA256SUMS.part
0a997bae99e4b427386bf970755659de52fa7371fc857bfd178c845e4dd795ff  guix-build-007ea322a649/output/x86_64-apple-darwin/bitcoin-007ea322a649-x86_64-apple-darwin-unsigned.tar.gz
6738e3b733aa4bc5d30b08bd1fb22c1c4aeab24d76067f6a4194cb046470b0c9  guix-build-007ea322a649/output/x86_64-apple-darwin/bitcoin-007ea322a649-x86_64-apple-darwin-unsigned.zip
b9b6b10620e49374cb709852e79b160b24af07f02e8a2ab048483a7e31520d81  guix-build-007ea322a649/output/x86_64-apple-darwin/bitcoin-007ea322a649-x86_64-apple-darwin.tar.gz
98b8a103ecee38b1c2c1673396c5ccec7476424a02b19e0cb7a2f11fe83a943c  guix-build-007ea322a649/output/x86_64-linux-gnu/SHA256SUMS.part
8e0ed2f26e9e729bc3573e1546456a7f19338d38156104de9e1f2fbc2db8d324  guix-build-007ea322a649/output/x86_64-linux-gnu/bitcoin-007ea322a649-x86_64-linux-gnu-debug.tar.gz
de5b064fe020131342c7e615bb2ed97e427bf0ea515b0ad6f1b34111899633a3  guix-build-007ea322a649/output/x86_64-linux-gnu/bitcoin-007ea322a649-x86_64-linux-gnu.tar.gz
dc8ed9048f79a992f212133b82c1be65992c1f11949eb2b4699e1a7ba3013fac  guix-build-007ea322a649/output/x86_64-w64-mingw32/SHA256SUMS.part
6fc5b3faf62ae53d0f62f56f9ad6101e51e7d375a3d678150f45af11f6221130  guix-build-007ea322a649/output/x86_64-w64-mingw32/bitcoin-007ea322a649-win64-debug.zip
8466a4d66bef41f9493e4efc0bc6add3a879d1c1f7ece74658f9069e07794ae6  guix-build-007ea322a649/output/x86_64-w64-mingw32/bitcoin-007ea322a649-win64-setup-unsigned.exe
c74b4b1d3c07176531776da7a02005b6e1af791645cdae15507bb38c83c6bb0c  guix-build-007ea322a649/output/x86_64-w64-mingw32/bitcoin-007ea322a649-win64-unsigned.tar.gz
be52bae5eb458be39c2bba3405812dcc8840b970c9f357cf2fe767a7e5deb889  guix-build-007ea322a649/output/x86_64-w64-mingw32/bitcoin-007ea322a649-win64.zip

@bitcoin bitcoin deleted a comment from mahmoodfateh Mar 29, 2024
@fanquake fanquake merged commit eb78ebc into bitcoin:master Apr 5, 2024
@fanquake fanquake deleted the libqrencode_cmake branch April 5, 2024 14:11
Pttn added a commit to RiecoinTeam/Riecoin that referenced this pull request Apr 13, 2024
achow101 added a commit that referenced this pull request Aug 5, 2024
ee934d0 doc: Add missed cmake package to build depends (Hennadii Stepanov)

Pull request description:

  CMake is used to build the following packages in depends when cross-compiling for Windows:
  - `libevent` (#29835)
  - `libnatpmp` (#29708)
  - `miniupnpc` (#29707)
  - `qrencode` (#29725)
  - `zeromq` (#29723)

ACKs for top commit:
  vostrnad:
    ACK ee934d0
  achow101:
    ACK ee934d0
  TheCharlatan:
    ACK ee934d0
  tdb3:
    cr ut ACK ee934d0

Tree-SHA512: 7483a680607aa218a375c285859ab19773267c81324de61f457f40057381090b15779534ff0ddb3d981341b9cd9b9e1d4afffda1ec5d5b105ad5bfcac3c7d76a
@knst knst mentioned this pull request Sep 29, 2024
5 tasks
UdjinM6 pushed a commit to PastaPastaPasta/dash that referenced this pull request Sep 29, 2024
007ea32 depends: switch to building libqrencode with CMake (fanquake)
884330c 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 007ea32

Tree-SHA512: c784f790ddea958082c8ae96d3744bdf99331a8799765f9d44f00861b8e2cfcab1a88a3d64af5b10e51a8d5938d55eb6a3d271790b565e50492a39d00dc0e30f
UdjinM6 pushed a commit to PastaPastaPasta/dash that referenced this pull request Sep 29, 2024
007ea32 depends: switch to building libqrencode with CMake (fanquake)
884330c 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 007ea32

Tree-SHA512: c784f790ddea958082c8ae96d3744bdf99331a8799765f9d44f00861b8e2cfcab1a88a3d64af5b10e51a8d5938d55eb6a3d271790b565e50492a39d00dc0e30f
PastaPastaPasta added a commit to dashpay/dash that referenced this pull request Oct 1, 2024
ae6e0ad Merge bitcoin#29725: depends: build libqrencode with CMake (fanquake)
1522896 fix mingw32 build (UdjinM6)
7bb1d0e Merge bitcoin#22724: windres: use PACKAGE_VERSION rather than building more version numbers (fanquake)
6bee8e2 Merge bitcoin#27496: depends: reuse _config_opts for CMake options (fanquake)
24973ee Merge bitcoin#30488: depends: Fix CMake-generated `libevent*.pc` files (merge-script)
a27b08e Merge bitcoin#29835: depends: build libevent with CMake (merge-script)
a204616 Merge bitcoin#30464: test, refactor: Fix MSVC warning C4101 "unreferenced local variable" (merge-script)
02aee12 Merge bitcoin#30508: depends: Fix CMake-generated `libzmq.pc` file (merge-script)
e2b2446 Merge bitcoin#29723: depends: build zeromq with CMake (merge-script)
685b7a7 Merge bitcoin#23611: build: add `LTO` option to depends (laanwj)
d2b8c6b Merge bitcoin#19952: build, ci: Add file-based logging for individual packages (laanwj)
fc1c29c partial Merge bitcoin#23478: build: Add support for Android NDK r23 LTS (fanquake)

Pull request description:

  ## Issue being fixed or feature implemented
  depends on #6293

  ## What was done?
    _Describe your changes in detail_

  ## How Has This Been Tested?
    _Please describe in detail how you tested your changes._

    _Include details of your testing environment, and the tests you ran
  to see how your change affects other areas of the code, etc._

  ## Breaking Changes
    _Please describe any breaking changes your code introduces_

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK ae6e0ad
  knst:
    utACK ae6e0ad
  knst:
    utACK ae6e0ad

Tree-SHA512: 0606c7596394155417ad0fea96ce7e1f905109ce2978987e1c4132e8b0f5a8593c5c62ea7217510169228e8238ba42b418a74635ded01f5d674f62495ad3b3a9
NicolaLS added a commit to NicolaLS/bitcoin that referenced this pull request Feb 17, 2025
Cmake was made a global requirement (bitcoin#29725) and the version used is
derived from guix time-machine recently bumped in bitcoin#30730.
NicolaLS added a commit to NicolaLS/bitcoin that referenced this pull request Feb 18, 2025
CMake was made a global requirement (bitcoin#29725) and the version used is
derived from guix time-machine recently bumped in bitcoin#30730.
NicolaLS added a commit to NicolaLS/bitcoin that referenced this pull request Apr 3, 2025
CMake was made a global requirement (bitcoin#29725) and the version used is
derived from guix time-machine recently bumped in bitcoin#30730.
@bitcoin bitcoin locked and limited conversation to collaborators Apr 5, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants