depends: build libqrencode with CMake

fanquake commented at 6:12 pm on March 25, 2024: 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 commented at 6:12 pm on March 25, 2024: contributor

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.

DrahtBot added the label Build system on Mar 25, 2024

in depends/packages/qrencode.mk:10 in 2e15b6f5af outdated

 8 define $(package)_set_vars
 9-$(package)_config_opts=--disable-shared --without-tools --without-tests --without-png
10-$(package)_config_opts += --disable-gprof --disable-gcov --disable-mudflap
11-$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
12+$(package)_config_opts := -DWITH_TOOLS=NO -DWITH_TESTS=NO -DGPROF=OFF -DCOVERAGE=OFF
13+$(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE

TheCharlatan commented at 9:29 am on March 26, 2024:

Nit: Could set WITHOUT_PNG=ON instead?

fanquake commented at 10:05 am on March 26, 2024:

I started there, but from what I can tell, that didn’t seem to fully work? You’d also still end up with all the output at the end of configuring, i.e:

0-- Found PNG: /opt/homebrew/lib/libpng.dylib (found version "1.6.43")
1<snip>
2--  .. PNG ......................... = TRUE
3--  .... PNG includes .............. = /opt/homebrew/include;/Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk/usr/include
4--  .... PNG library ............... = /opt/homebrew/lib/libpng.dylib;/Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk/usr/lib/libz.tbd

which could be confusing. Which is why I opted for CMAKE_DISABLE_FIND_PACKAGE_PNG instead.

0--  .. PNG ......................... = 
1--  .... PNG includes .............. = 
2--  .... PNG library ............... =

TheCharlatan commented at 10:22 am on March 26, 2024:

If it’s down to the output why not do both so we also get:

0--  Project configuration:
1--  .. Build test programs  ........ = OFF
2--  .. Build utility tools  ........ = OFF
3--  .. Disable PNG support  ........ = ON

fanquake commented at 10:28 am on March 26, 2024:

Fair enough. Have added that now.

guix: make cmake-minimal a global requirement

Needed for switching to building miniupnpc with CMake.

884330c0a5

depends: switch to building libqrencode with CMake 007ea322a6

fanquake force-pushed on Mar 26, 2024

TheCharlatan approved

TheCharlatan commented at 3:20 pm on March 26, 2024: contributor

ACK 007ea322a6492d46f1565ef58a0c49f5b468ff20

Guix builds (x86_64)

 0158bcb78ca2652a69a3974d1aa8bcf51018f8f1a80a61739a4e63b85ed829c4b  guix-build-007ea322a649/output/aarch64-linux-gnu/SHA256SUMS.part
 1b372f2cedab3320487a12d35ac3c5ce314b983659b59c4af9b124d6d4d140829  guix-build-007ea322a649/output/aarch64-linux-gnu/bitcoin-007ea322a649-aarch64-linux-gnu-debug.tar.gz
 25d5890f0e1ef5203f116dd30542775645bcd169b00539a1f064b7b351219f942  guix-build-007ea322a649/output/aarch64-linux-gnu/bitcoin-007ea322a649-aarch64-linux-gnu.tar.gz
 31e01981544d7c6299521514a90f97d7f5e57a266583db8f6dd44519cb8daf6d2  guix-build-007ea322a649/output/arm-linux-gnueabihf/SHA256SUMS.part
 42440420e3812b05b24179e85e247460c9e9eb1152a0856325d09bfdba77bb25d  guix-build-007ea322a649/output/arm-linux-gnueabihf/bitcoin-007ea322a649-arm-linux-gnueabihf-debug.tar.gz
 55bd50ccb716f04624d4beb89ae796a2fc487d04c07f0f93967863a5ee9009dd7  guix-build-007ea322a649/output/arm-linux-gnueabihf/bitcoin-007ea322a649-arm-linux-gnueabihf.tar.gz
 6a62bf84f681227012a1f4849f32ff33e4c18dd1be20409cf2ffd8775adfecc7e  guix-build-007ea322a649/output/arm64-apple-darwin/SHA256SUMS.part
 7410d7c0bc5c701310d3834185add4f4550f6d4c1ca9cb034ff26ba89f863bf81  guix-build-007ea322a649/output/arm64-apple-darwin/bitcoin-007ea322a649-arm64-apple-darwin-unsigned.tar.gz
 870bfdda7b85c0c53e6ec7858787275367758473834727bb9fbb9984cd5436a3b  guix-build-007ea322a649/output/arm64-apple-darwin/bitcoin-007ea322a649-arm64-apple-darwin-unsigned.zip
 96ab15eab9b54859b90b1d493631ee19270ea1d9b309eb1e6d8da74ba56d638cf  guix-build-007ea322a649/output/arm64-apple-darwin/bitcoin-007ea322a649-arm64-apple-darwin.tar.gz
10fb5359705952f2f16c95dce9b28aa38188530a7002d6503aad292a9a9b76ee24  guix-build-007ea322a649/output/dist-archive/bitcoin-007ea322a649.tar.gz
114ad4948c691f35b513368740cff105866565afec60dc1013bee748071e4ff051  guix-build-007ea322a649/output/powerpc64-linux-gnu/SHA256SUMS.part
12e3a78205bdfbf6ca41290cca0e6c6bf27ee61328a92c448fbb5966e514a1b449  guix-build-007ea322a649/output/powerpc64-linux-gnu/bitcoin-007ea322a649-powerpc64-linux-gnu-debug.tar.gz
130a0d2e0ada4486df2948d6ab51374f10f500a36fb0760f4c5aca796feb66b23d  guix-build-007ea322a649/output/powerpc64-linux-gnu/bitcoin-007ea322a649-powerpc64-linux-gnu.tar.gz
14b1db2aefe009780bc7fa76b488cd5d6c7c5ff8b7663c0171cf755a83e9c4113f  guix-build-007ea322a649/output/riscv64-linux-gnu/SHA256SUMS.part
15e3432926765170e2803b95930db62dfd0666a313a8614e3fb044720d44a399c1  guix-build-007ea322a649/output/riscv64-linux-gnu/bitcoin-007ea322a649-riscv64-linux-gnu-debug.tar.gz
162d265b9f32ff0a2f7efc7798bc66eba0d2126a684ff551642117797b27b4def1  guix-build-007ea322a649/output/riscv64-linux-gnu/bitcoin-007ea322a649-riscv64-linux-gnu.tar.gz
1719a26c31d84c1b0a52f7aba473bde45e1410e39b081ed39f48f198d89bdf3222  guix-build-007ea322a649/output/x86_64-apple-darwin/SHA256SUMS.part
180a997bae99e4b427386bf970755659de52fa7371fc857bfd178c845e4dd795ff  guix-build-007ea322a649/output/x86_64-apple-darwin/bitcoin-007ea322a649-x86_64-apple-darwin-unsigned.tar.gz
196738e3b733aa4bc5d30b08bd1fb22c1c4aeab24d76067f6a4194cb046470b0c9  guix-build-007ea322a649/output/x86_64-apple-darwin/bitcoin-007ea322a649-x86_64-apple-darwin-unsigned.zip
20b9b6b10620e49374cb709852e79b160b24af07f02e8a2ab048483a7e31520d81  guix-build-007ea322a649/output/x86_64-apple-darwin/bitcoin-007ea322a649-x86_64-apple-darwin.tar.gz
2198b8a103ecee38b1c2c1673396c5ccec7476424a02b19e0cb7a2f11fe83a943c  guix-build-007ea322a649/output/x86_64-linux-gnu/SHA256SUMS.part
228e0ed2f26e9e729bc3573e1546456a7f19338d38156104de9e1f2fbc2db8d324  guix-build-007ea322a649/output/x86_64-linux-gnu/bitcoin-007ea322a649-x86_64-linux-gnu-debug.tar.gz
23de5b064fe020131342c7e615bb2ed97e427bf0ea515b0ad6f1b34111899633a3  guix-build-007ea322a649/output/x86_64-linux-gnu/bitcoin-007ea322a649-x86_64-linux-gnu.tar.gz
24dc8ed9048f79a992f212133b82c1be65992c1f11949eb2b4699e1a7ba3013fac  guix-build-007ea322a649/output/x86_64-w64-mingw32/SHA256SUMS.part
256fc5b3faf62ae53d0f62f56f9ad6101e51e7d375a3d678150f45af11f6221130  guix-build-007ea322a649/output/x86_64-w64-mingw32/bitcoin-007ea322a649-win64-debug.zip
268466a4d66bef41f9493e4efc0bc6add3a879d1c1f7ece74658f9069e07794ae6  guix-build-007ea322a649/output/x86_64-w64-mingw32/bitcoin-007ea322a649-win64-setup-unsigned.exe
27c74b4b1d3c07176531776da7a02005b6e1af791645cdae15507bb38c83c6bb0c  guix-build-007ea322a649/output/x86_64-w64-mingw32/bitcoin-007ea322a649-win64-unsigned.tar.gz
28be52bae5eb458be39c2bba3405812dcc8840b970c9f357cf2fe767a7e5deb889  guix-build-007ea322a649/output/x86_64-w64-mingw32/bitcoin-007ea322a649-win64.zip

bitcoin deleted a comment on Mar 29, 2024

fanquake merged this on Apr 5, 2024

fanquake closed this on Apr 5, 2024

fanquake deleted the branch on Apr 5, 2024

depends: build libqrencode with CMake #29725

Code Coverage

Reviews

Conflicts