depends: patch libool out of libnatpmp/miniupnpc #29298
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
ee60121 to
206ef82
Compare
Note that this is completely unrelated to gnu usage of libtool.
206ef82 to
5b9d5bf
Compare
|
Removed one more missed instance of |
TheCharlatan
approved these changes
Jan 26, 2024
There was a problem hiding this comment.
ACK 5b9d5bf
Guix build (x86):
8b32a57c3b091605070673f6338768f6ee3d5731a553ae96b426827afaf8b8f1 guix-build-5b9d5bf86650/output/aarch64-linux-gnu/SHA256SUMS.part
02a85cac626984fb8d0ea14b449af6ea916c9a3f9f9e3d68137505f5cddded60 guix-build-5b9d5bf86650/output/aarch64-linux-gnu/bitcoin-5b9d5bf86650-aarch64-linux-gnu-debug.tar.gz
f504943f0cea5bfa512a8677c8d0d1968eabcfc5a17d3fc7b810e098d7303019 guix-build-5b9d5bf86650/output/aarch64-linux-gnu/bitcoin-5b9d5bf86650-aarch64-linux-gnu.tar.gz
f976f70dd216792ae78fdee40513cf600f9b9e324e7a42e86f0098129e15216b guix-build-5b9d5bf86650/output/arm-linux-gnueabihf/SHA256SUMS.part
b6834f3aedac078ea772b38635b5345887d0fb68fa4b9f2f894ad05e1cb8eb0e guix-build-5b9d5bf86650/output/arm-linux-gnueabihf/bitcoin-5b9d5bf86650-arm-linux-gnueabihf-debug.tar.gz
76058ae27189a14584fd2e3af1aaf721ac7e583902e140b60a308d05ad89ce57 guix-build-5b9d5bf86650/output/arm-linux-gnueabihf/bitcoin-5b9d5bf86650-arm-linux-gnueabihf.tar.gz
33887448717e85acf33b04f8a1464c83312f6b0bd7271c5852164a58eef97f52 guix-build-5b9d5bf86650/output/arm64-apple-darwin/SHA256SUMS.part
55393a180f4fc0539f0a22a16cb67edc659cae70f04cacad44b549d325a990ce guix-build-5b9d5bf86650/output/arm64-apple-darwin/bitcoin-5b9d5bf86650-arm64-apple-darwin-unsigned.tar.gz
1d9799023fd4646ea6e4bdb7c8a1babf6f7dc86d26bf60f0ee48af84409625f0 guix-build-5b9d5bf86650/output/arm64-apple-darwin/bitcoin-5b9d5bf86650-arm64-apple-darwin-unsigned.zip
13c38211297c307dc28d270164ddb29b2196deee8441e58161eea009d63423c3 guix-build-5b9d5bf86650/output/arm64-apple-darwin/bitcoin-5b9d5bf86650-arm64-apple-darwin.tar.gz
a747043fa34d49eff945045524941ff685c335087e57782f68e0c548159ff805 guix-build-5b9d5bf86650/output/dist-archive/bitcoin-5b9d5bf86650.tar.gz
1d9f57ee098f04e5ff610618e0d99054fc81e0497ccd3770a1cd683935626436 guix-build-5b9d5bf86650/output/powerpc64-linux-gnu/SHA256SUMS.part
d297ffc3be3e9e51157e2e239bfe594a172c4553c8d5259f8d88829567c50aa4 guix-build-5b9d5bf86650/output/powerpc64-linux-gnu/bitcoin-5b9d5bf86650-powerpc64-linux-gnu-debug.tar.gz
7e4870c2da70ba3d02f0cba01ccd1dd3009cbece98d7e37d227d8436ac6c37d4 guix-build-5b9d5bf86650/output/powerpc64-linux-gnu/bitcoin-5b9d5bf86650-powerpc64-linux-gnu.tar.gz
bca0f46c3c6db185bfda1d49ccbe43c2601280c071b5e079867b20a605a63e92 guix-build-5b9d5bf86650/output/powerpc64le-linux-gnu/SHA256SUMS.part
8ea6fe45e8d26b1aff7b6d7d7faa2714117aab9360804d27fe7cfce3386b4c4a guix-build-5b9d5bf86650/output/powerpc64le-linux-gnu/bitcoin-5b9d5bf86650-powerpc64le-linux-gnu-debug.tar.gz
1926c505251ab255e03591b2e6d214a76243704fb22f0cdd0805dae2fc61054f guix-build-5b9d5bf86650/output/powerpc64le-linux-gnu/bitcoin-5b9d5bf86650-powerpc64le-linux-gnu.tar.gz
d20c14c72273274ee1b0e50dbb3d4fee1d1341a1867491f6256a327a1145bcc2 guix-build-5b9d5bf86650/output/riscv64-linux-gnu/SHA256SUMS.part
d78190298c511fbc0826be034bda3e42173ce8a72a42a39fd98f8372d15e299e guix-build-5b9d5bf86650/output/riscv64-linux-gnu/bitcoin-5b9d5bf86650-riscv64-linux-gnu-debug.tar.gz
f7838a3d1275f364bdd95bbe3ad828a36020d0574dc8b6e9ffa210ad5abc0f88 guix-build-5b9d5bf86650/output/riscv64-linux-gnu/bitcoin-5b9d5bf86650-riscv64-linux-gnu.tar.gz
1967ed6640f36e0973480741e4cef7969b68f50b0b6a0e02b1cbfba63f1c6989 guix-build-5b9d5bf86650/output/x86_64-apple-darwin/SHA256SUMS.part
74a8abf167eb0a74ebc772555c83b65d1001ba594e95d2528df75fe6897e814c guix-build-5b9d5bf86650/output/x86_64-apple-darwin/bitcoin-5b9d5bf86650-x86_64-apple-darwin-unsigned.tar.gz
db49c29e4cb976310b989fedcfcc04427572675ce302de93eb4dc1a550614296 guix-build-5b9d5bf86650/output/x86_64-apple-darwin/bitcoin-5b9d5bf86650-x86_64-apple-darwin-unsigned.zip
144b7ccc1f24217d854d2fbc708e14f5d9fb676c831214f970ec3d4668e0ee92 guix-build-5b9d5bf86650/output/x86_64-apple-darwin/bitcoin-5b9d5bf86650-x86_64-apple-darwin.tar.gz
1359a3aa82e9b080600817a77c0b4af9aba2174ceea670ca8ac20eef062d36c8 guix-build-5b9d5bf86650/output/x86_64-linux-gnu/SHA256SUMS.part
aa77d50f172daaabecf16571bbd5d043747bbc729637e20249f7b7f997ce9029 guix-build-5b9d5bf86650/output/x86_64-linux-gnu/bitcoin-5b9d5bf86650-x86_64-linux-gnu-debug.tar.gz
2404ec35f1a1025085b912d98139909115c42630458a536b275cb2a714c48cff guix-build-5b9d5bf86650/output/x86_64-linux-gnu/bitcoin-5b9d5bf86650-x86_64-linux-gnu.tar.gz
2cf7dd0540b3a13779710b2172cde7eb7fa479270fe242b89b96b87ae7bfdfcb guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/SHA256SUMS.part
774e5c3cf7efa7a4e1daba9943898e9f47d3feeeafd2aa3d50e9422526eb1951 guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/bitcoin-5b9d5bf86650-win64-debug.zip
1bb3ccd4cdaa22631a4c64d8b07fac204d3495126b187b7f8bccc4b0e46d3277 guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/bitcoin-5b9d5bf86650-win64-setup-unsigned.exe
1ed5118d90a17fc7d1bfdf9a08cd7237c456535b1dece3e2e3ee502cf3f0a771 guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/bitcoin-5b9d5bf86650-win64-unsigned.tar.gz
8e1096abb82c5fb7963fe554e1848e354cb4754f553b763de19148dd7584ae55 guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/bitcoin-5b9d5bf86650-win64.zip
fanquake
approved these changes
Jan 29, 2024
There was a problem hiding this comment.
ACK 5b9d5bf
Guix Build (aarch64):
8b32a57c3b091605070673f6338768f6ee3d5731a553ae96b426827afaf8b8f1 guix-build-5b9d5bf86650/output/aarch64-linux-gnu/SHA256SUMS.part
02a85cac626984fb8d0ea14b449af6ea916c9a3f9f9e3d68137505f5cddded60 guix-build-5b9d5bf86650/output/aarch64-linux-gnu/bitcoin-5b9d5bf86650-aarch64-linux-gnu-debug.tar.gz
f504943f0cea5bfa512a8677c8d0d1968eabcfc5a17d3fc7b810e098d7303019 guix-build-5b9d5bf86650/output/aarch64-linux-gnu/bitcoin-5b9d5bf86650-aarch64-linux-gnu.tar.gz
f976f70dd216792ae78fdee40513cf600f9b9e324e7a42e86f0098129e15216b guix-build-5b9d5bf86650/output/arm-linux-gnueabihf/SHA256SUMS.part
b6834f3aedac078ea772b38635b5345887d0fb68fa4b9f2f894ad05e1cb8eb0e guix-build-5b9d5bf86650/output/arm-linux-gnueabihf/bitcoin-5b9d5bf86650-arm-linux-gnueabihf-debug.tar.gz
76058ae27189a14584fd2e3af1aaf721ac7e583902e140b60a308d05ad89ce57 guix-build-5b9d5bf86650/output/arm-linux-gnueabihf/bitcoin-5b9d5bf86650-arm-linux-gnueabihf.tar.gz
33887448717e85acf33b04f8a1464c83312f6b0bd7271c5852164a58eef97f52 guix-build-5b9d5bf86650/output/arm64-apple-darwin/SHA256SUMS.part
55393a180f4fc0539f0a22a16cb67edc659cae70f04cacad44b549d325a990ce guix-build-5b9d5bf86650/output/arm64-apple-darwin/bitcoin-5b9d5bf86650-arm64-apple-darwin-unsigned.tar.gz
1d9799023fd4646ea6e4bdb7c8a1babf6f7dc86d26bf60f0ee48af84409625f0 guix-build-5b9d5bf86650/output/arm64-apple-darwin/bitcoin-5b9d5bf86650-arm64-apple-darwin-unsigned.zip
13c38211297c307dc28d270164ddb29b2196deee8441e58161eea009d63423c3 guix-build-5b9d5bf86650/output/arm64-apple-darwin/bitcoin-5b9d5bf86650-arm64-apple-darwin.tar.gz
a747043fa34d49eff945045524941ff685c335087e57782f68e0c548159ff805 guix-build-5b9d5bf86650/output/dist-archive/bitcoin-5b9d5bf86650.tar.gz
1d9f57ee098f04e5ff610618e0d99054fc81e0497ccd3770a1cd683935626436 guix-build-5b9d5bf86650/output/powerpc64-linux-gnu/SHA256SUMS.part
d297ffc3be3e9e51157e2e239bfe594a172c4553c8d5259f8d88829567c50aa4 guix-build-5b9d5bf86650/output/powerpc64-linux-gnu/bitcoin-5b9d5bf86650-powerpc64-linux-gnu-debug.tar.gz
7e4870c2da70ba3d02f0cba01ccd1dd3009cbece98d7e37d227d8436ac6c37d4 guix-build-5b9d5bf86650/output/powerpc64-linux-gnu/bitcoin-5b9d5bf86650-powerpc64-linux-gnu.tar.gz
bca0f46c3c6db185bfda1d49ccbe43c2601280c071b5e079867b20a605a63e92 guix-build-5b9d5bf86650/output/powerpc64le-linux-gnu/SHA256SUMS.part
8ea6fe45e8d26b1aff7b6d7d7faa2714117aab9360804d27fe7cfce3386b4c4a guix-build-5b9d5bf86650/output/powerpc64le-linux-gnu/bitcoin-5b9d5bf86650-powerpc64le-linux-gnu-debug.tar.gz
1926c505251ab255e03591b2e6d214a76243704fb22f0cdd0805dae2fc61054f guix-build-5b9d5bf86650/output/powerpc64le-linux-gnu/bitcoin-5b9d5bf86650-powerpc64le-linux-gnu.tar.gz
d20c14c72273274ee1b0e50dbb3d4fee1d1341a1867491f6256a327a1145bcc2 guix-build-5b9d5bf86650/output/riscv64-linux-gnu/SHA256SUMS.part
d78190298c511fbc0826be034bda3e42173ce8a72a42a39fd98f8372d15e299e guix-build-5b9d5bf86650/output/riscv64-linux-gnu/bitcoin-5b9d5bf86650-riscv64-linux-gnu-debug.tar.gz
f7838a3d1275f364bdd95bbe3ad828a36020d0574dc8b6e9ffa210ad5abc0f88 guix-build-5b9d5bf86650/output/riscv64-linux-gnu/bitcoin-5b9d5bf86650-riscv64-linux-gnu.tar.gz
1967ed6640f36e0973480741e4cef7969b68f50b0b6a0e02b1cbfba63f1c6989 guix-build-5b9d5bf86650/output/x86_64-apple-darwin/SHA256SUMS.part
74a8abf167eb0a74ebc772555c83b65d1001ba594e95d2528df75fe6897e814c guix-build-5b9d5bf86650/output/x86_64-apple-darwin/bitcoin-5b9d5bf86650-x86_64-apple-darwin-unsigned.tar.gz
db49c29e4cb976310b989fedcfcc04427572675ce302de93eb4dc1a550614296 guix-build-5b9d5bf86650/output/x86_64-apple-darwin/bitcoin-5b9d5bf86650-x86_64-apple-darwin-unsigned.zip
144b7ccc1f24217d854d2fbc708e14f5d9fb676c831214f970ec3d4668e0ee92 guix-build-5b9d5bf86650/output/x86_64-apple-darwin/bitcoin-5b9d5bf86650-x86_64-apple-darwin.tar.gz
1359a3aa82e9b080600817a77c0b4af9aba2174ceea670ca8ac20eef062d36c8 guix-build-5b9d5bf86650/output/x86_64-linux-gnu/SHA256SUMS.part
aa77d50f172daaabecf16571bbd5d043747bbc729637e20249f7b7f997ce9029 guix-build-5b9d5bf86650/output/x86_64-linux-gnu/bitcoin-5b9d5bf86650-x86_64-linux-gnu-debug.tar.gz
2404ec35f1a1025085b912d98139909115c42630458a536b275cb2a714c48cff guix-build-5b9d5bf86650/output/x86_64-linux-gnu/bitcoin-5b9d5bf86650-x86_64-linux-gnu.tar.gz
2cf7dd0540b3a13779710b2172cde7eb7fa479270fe242b89b96b87ae7bfdfcb guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/SHA256SUMS.part
774e5c3cf7efa7a4e1daba9943898e9f47d3feeeafd2aa3d50e9422526eb1951 guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/bitcoin-5b9d5bf86650-win64-debug.zip
1bb3ccd4cdaa22631a4c64d8b07fac204d3495126b187b7f8bccc4b0e46d3277 guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/bitcoin-5b9d5bf86650-win64-setup-unsigned.exe
1ed5118d90a17fc7d1bfdf9a08cd7237c456535b1dece3e2e3ee502cf3f0a771 guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/bitcoin-5b9d5bf86650-win64-unsigned.tar.gz
8e1096abb82c5fb7963fe554e1848e354cb4754f553b763de19148dd7584ae55 guix-build-5b9d5bf86650/output/x86_64-w64-mingw32/bitcoin-5b9d5bf86650-win64.zip
Fabcien
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Jul 31, 2024
Summary: ``` cctools' libtool (and llvm's clone) are unnecessary these days, and were only used (unnecessarily) in miniupnpc and libnatpnp. Both of those projects now have CMake support which eliminates their use. ``` Backport of [[bitcoin/bitcoin#29298 | core#29298]]. Depends on D16563. Test Plan: Run the GUIX builds. Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D16564
roqqit
pushed a commit
to doged-io/doged
that referenced
this pull request
Aug 1, 2024
Summary: ``` cctools' libtool (and llvm's clone) are unnecessary these days, and were only used (unnecessarily) in miniupnpc and libnatpnp. Both of those projects now have CMake support which eliminates their use. ``` Backport of [[bitcoin/bitcoin#29298 | core#29298]]. Depends on D16563. Test Plan: Run the GUIX builds. Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D16564
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Nov 7, 2024
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Nov 7, 2024
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Nov 15, 2024
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Nov 16, 2024
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Nov 17, 2024
PastaPastaPasta
added a commit
to dashpay/dash
that referenced
this pull request
Nov 17, 2024
, bitcoin#28622, bitcoin#28880, bitcoin#29185, bitcoin#29170, bitcoin#29233, bitcoin#29298, bitcoin#29598, bitcoin#29732, bitcoin#29890, bitcoin#29739, bitcoin#30074, bitcoin#30198, bitcoin#29072 (toolchain backports: part 2) 1506d9d merge bitcoin#29072: use `-no_exported_symbols` on macOS (Kittywhiskers Van Gogh) 9247960 merge bitcoin#30198: qt 5.15.14 and fix macOS build with Clang 18 (Kittywhiskers Van Gogh) 5585e7a merge bitcoin#30074: use ENV flags in get_arch (Kittywhiskers Van Gogh) decd420 merge bitcoin#29739: swap cctools otool for llvm-objdump (Kittywhiskers Van Gogh) 0f8c420 merge bitcoin#29890: remove some tools when cross-compiling for macOS (Kittywhiskers Van Gogh) 936da1a merge bitcoin#29732: qt 5.15.13 (Kittywhiskers Van Gogh) c294b47 revert: patch qt to make placeholders differ from actual text (Kittywhiskers Van Gogh) af7090c merge bitcoin#29598: don't use -h with touch on OpenBSD (Kittywhiskers Van Gogh) ebf8ff2 merge bitcoin#29298: patch libtool out of libnatpmp/miniupnpc (Kittywhiskers Van Gogh) 070b876 merge bitcoin#29233: depends move macOS C(XX) FLAGS out of C & CXX (Kittywhiskers Van Gogh) d838481 revert dash#2398: Force fvisibility=hidden when compiling on macos (Kittywhiskers Van Gogh) 59a18f9 merge bitcoin#29170: add macho branch protection check (Kittywhiskers Van Gogh) cb024d9 merge bitcoin#29185: remove `--enable-lto` (Kittywhiskers Van Gogh) 6d75a81 merge bitcoin#28880: switch to using LLVM 17.x for macOS builds (Kittywhiskers Van Gogh) 7b0a1f2 merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0) (Kittywhiskers Van Gogh) 02eb735 merge bitcoin#24948: fix typo in permissions (Kittywhiskers Van Gogh) 2739107 merge bitcoin#24534: make gen-sdk deterministic (Kittywhiskers Van Gogh) ab10bf9 merge bitcoin#24241: cleanup doc on need of Developer Account to obtain macOS SDK (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependent on #6384 * Dependency for #6389 * The Qt patch introduced in [dash#5596](#5596), `fix_qt_placeholders.patch`, was a portion of a suggested workaround for QTBUG-92199 ([source](https://bugreports.qt.io/browse/QTBUG-92199?focusedId=669719&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-669719)) but since then, a fix ([here](https://codereview.qt-project.org/c/qt/qtbase/+/434310)) has made its way to 5.15.12 and we are upgrading to 5.15.14 from 5.15.11. So we can safely remove this patch. ## Breaking Changes None expected ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 1506d9d PastaPastaPasta: utACK 1506d9d Tree-SHA512: df8e4ea0ce9e7b269d248518698f0566b5eca1a54cdfb53f5b213b90fb5177e5a5df44eaeb6f3fc014cd93351c9245736bb2fd52bc2af4ae274d8fa93e601b07
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An alternative to #29232
Rather than switching to the CMake builds which proved problematic, do the quick and dirty thing of just patching out libtool. Doesn't seem to introduce any new issues.
This should buy us time to upstream the necessary CMake fixes.