build: patch around qt duplicate symbol issue #24722

pull fanquake wants to merge 1 commits into bitcoin:master from fanquake:more_qt_nonsense changing 2 files +106 −1
  1. fanquake commented at 11:07 am on March 31, 2022: member

    This is currently causing the same failure in two different PRs:

    #24391: build: stop overriding user autoconf flags

    0duplicate symbol 'lcQpaFonts()' in:
    1    /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5ThemeSupport.a(qgenericunixthemes.o)
    2    /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5FontDatabaseSupport.a(qfontengine_coretext.o)
    3ld: 1 duplicate symbol for architecture x86_64
    

    #21778: build: LLVM 14 & LLD based macOS toolchain

    0x86_64-apple-darwin-ld: error: duplicate symbol: __Z10lcQpaFontsv
    1>>> defined in /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5ThemeSupport.a(qgenericunixthemes.o)
    2>>> defined in /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5FontDatabaseSupport.a(qfontengine_coretext.o)
    

    Guix Build (x86_64):

     082dd305045fa908d3a5909c8f7827e4ab607281b84706e0722d32e4c1c507cef  guix-build-a24ef27cfe6e/output/aarch64-linux-gnu/SHA256SUMS.part
     1dadef04a291a1e371cac7eef0056948180fcad86ba77f9fc7b844b389461bbe1  guix-build-a24ef27cfe6e/output/aarch64-linux-gnu/bitcoin-a24ef27cfe6e-aarch64-linux-gnu-debug.tar.gz
     267842aef90a56be203388a6838b95d6f472d018fdbf399b12b9e0b577e101651  guix-build-a24ef27cfe6e/output/aarch64-linux-gnu/bitcoin-a24ef27cfe6e-aarch64-linux-gnu.tar.gz
     3bef26de8cdd47853c1bca34e2cf002a9734394a7a3e027aba1b713738b4a3794  guix-build-a24ef27cfe6e/output/arm-linux-gnueabihf/SHA256SUMS.part
     45198227d1b7801032f358da348bc577a4d99273b0ecca50b83ad1b3d5d2f9d92  guix-build-a24ef27cfe6e/output/arm-linux-gnueabihf/bitcoin-a24ef27cfe6e-arm-linux-gnueabihf-debug.tar.gz
     597656b94a4b8bedd87a8a2d11e032d01f6cb22fa22f26e047deab9fc70886733  guix-build-a24ef27cfe6e/output/arm-linux-gnueabihf/bitcoin-a24ef27cfe6e-arm-linux-gnueabihf.tar.gz
     6ea0b7fa4458d36c349d7b56813c75a1957bb904945265bd26f970a5b6f8a1817  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/SHA256SUMS.part
     7f7741dc1baf0e59713f42fef8b53e613fef62abbeef9ca5c8187b04b7a81054f  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/bitcoin-a24ef27cfe6e-arm64-apple-darwin-unsigned.dmg
     87d27ebc99af2a35ee21736dc13adf76c5e646a3b5c00cf6a4bf56077b1ce0db4  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/bitcoin-a24ef27cfe6e-arm64-apple-darwin-unsigned.tar.gz
     9ae47461a03cff74d8e9e575c52148d1378ed883f41557cdf57f626532adfd60e  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/bitcoin-a24ef27cfe6e-arm64-apple-darwin.tar.gz
    1014f55113414fa633e4499cd83ebed9f1f4d9a36e0ab2ec550cbba159d00d1de8  guix-build-a24ef27cfe6e/output/dist-archive/bitcoin-a24ef27cfe6e.tar.gz
    11a2834efc9b7ac1545e442f5b527b1a739713b399c3591cfa4ac07d30a858017f  guix-build-a24ef27cfe6e/output/powerpc64-linux-gnu/SHA256SUMS.part
    12720120e641fe527dbe1f6979e3ed0222238f79a0cfac067838bc91739aa3f2d9  guix-build-a24ef27cfe6e/output/powerpc64-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64-linux-gnu-debug.tar.gz
    13e150946434a4f0b59b7dfdec65d02a2db4290b3e7f5eade1141905ef56b7587b  guix-build-a24ef27cfe6e/output/powerpc64-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64-linux-gnu.tar.gz
    141255c0e22087042f2262acc3f7d043659a9a2cbd0767b65ba355f89bc4589915  guix-build-a24ef27cfe6e/output/powerpc64le-linux-gnu/SHA256SUMS.part
    1543152dcfcff13d60c5f6fbfaed328643e6a18d43f1f0935742732080e142e40d  guix-build-a24ef27cfe6e/output/powerpc64le-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64le-linux-gnu-debug.tar.gz
    1641ec8e457921ecf4241209015441bcf6ced53e1430f5637aef0ed837de175dfb  guix-build-a24ef27cfe6e/output/powerpc64le-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64le-linux-gnu.tar.gz
    175edeefb9479d14ff8b2f6c40390ae6a8995d42238be56c1edd2c462d065fb1e7  guix-build-a24ef27cfe6e/output/riscv64-linux-gnu/SHA256SUMS.part
    18f037d4cc378da0c00b10f2960cb853377b2c0710aba4ed17c8f10ff9e8ab2cd8  guix-build-a24ef27cfe6e/output/riscv64-linux-gnu/bitcoin-a24ef27cfe6e-riscv64-linux-gnu-debug.tar.gz
    19793d0f8710e300adb6aff2e289370fb71c60d5d844970161898c359f3dea0f2f  guix-build-a24ef27cfe6e/output/riscv64-linux-gnu/bitcoin-a24ef27cfe6e-riscv64-linux-gnu.tar.gz
    20caeed20b8b301abdd32cb82c290ef77b283eb7b9f341254cdcf846f6d85365a9  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/SHA256SUMS.part
    215f02de0e7149b70b6fe612cc382e27c3e8691a2c8d05730604ea92410843d62c  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/bitcoin-a24ef27cfe6e-x86_64-apple-darwin-unsigned.dmg
    220f5a5041a12061e4e9f5fcfc803cd2a98636d964845a76713d83575caef5a4f6  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/bitcoin-a24ef27cfe6e-x86_64-apple-darwin-unsigned.tar.gz
    23adc74b896eba9eb6b6ef5da0d909f2d3c529a23b55fff4c8af4465b277b46217  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/bitcoin-a24ef27cfe6e-x86_64-apple-darwin.tar.gz
    2457a56059e4054e5becdbc36a6765f3b209535a78d4fa3f8a932d65e6b12d9c05  guix-build-a24ef27cfe6e/output/x86_64-linux-gnu/SHA256SUMS.part
    255c163f6c9936307b139fcc91e9a129e144c7961b44e11b245b0c9402b6b919a8  guix-build-a24ef27cfe6e/output/x86_64-linux-gnu/bitcoin-a24ef27cfe6e-x86_64-linux-gnu-debug.tar.gz
    267c1f9370fe8e26e3363198f3cd3f1d817662bc944f873138bcff997cda2d3c25  guix-build-a24ef27cfe6e/output/x86_64-linux-gnu/bitcoin-a24ef27cfe6e-x86_64-linux-gnu.tar.gz
    270708072d2c81ed5e7d54bfec350d8737931e13bd9291bdb72925c096be33f186  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/SHA256SUMS.part
    280b9b931fb4902a2779a193ca96fee01d1790644a004cd8898e24f008799d1a24  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64-debug.zip
    29d19c8cbb2b3359ebf0b66dada69f3a88eb41c0945c0e2b847bc2684f1c3d1985  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64-setup-unsigned.exe
    305797bb51c61b2857c0912e205bc886a29bc537076da00bba4c3e27c479d23c9c  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64-unsigned.tar.gz
    31131d9aff0d9c72f1d27cac728b7fdd42f6e961214eec330fc38e1d644869b6f8  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64.zip
    

    Guix Build (arm64):

     0fef112513bde9d33b071efd0e1c3965b10103c7f8c2c66838b6e2f0556bb62b2  guix-build-a24ef27cfe6e/output/arm-linux-gnueabihf/SHA256SUMS.part
     171b8117e6558fc455235a172b65f882b1d2ee8bcebc456f97ceafaa109c683ee  guix-build-a24ef27cfe6e/output/arm-linux-gnueabihf/bitcoin-a24ef27cfe6e-arm-linux-gnueabihf-debug.tar.gz
     225df44270fc5495967509dd36455ad70179f30b9d2819f6a86a72bbabb7a0396  guix-build-a24ef27cfe6e/output/arm-linux-gnueabihf/bitcoin-a24ef27cfe6e-arm-linux-gnueabihf.tar.gz
     3918ce9c69609f4cf07fdb2de699c54db4ad39dc0e79eeb9ea1b7ef7333bc7d5c  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/SHA256SUMS.part
     463a6082ed74497c957309d72e517905ac1071c45527241c8d5d08327af00e3b4  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/bitcoin-a24ef27cfe6e-arm64-apple-darwin-unsigned.dmg
     5dce37e97b56c9612f7fed92c58a0f9ba58a7829db2dabcd6fea56935fa4aa7dd  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/bitcoin-a24ef27cfe6e-arm64-apple-darwin-unsigned.tar.gz
     6056aaa181c8d6f6ae6cf9e8c1d3d9344c31ed4b73fd41d7fe2b89761d2a8ca7e  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/bitcoin-a24ef27cfe6e-arm64-apple-darwin.tar.gz
     714f55113414fa633e4499cd83ebed9f1f4d9a36e0ab2ec550cbba159d00d1de8  guix-build-a24ef27cfe6e/output/dist-archive/bitcoin-a24ef27cfe6e.tar.gz
     8e16e0f4fedf8761f220098c1986c0d53f4f051362ba4ff44d89a350a62f3fd3a  guix-build-a24ef27cfe6e/output/powerpc64-linux-gnu/SHA256SUMS.part
     9ae804d7a23bda9dc196200cd9d4caf0bd5d0611597a3e40da1dc2b27dee0effd  guix-build-a24ef27cfe6e/output/powerpc64-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64-linux-gnu-debug.tar.gz
    1082b274e6bbca6f5c2b70809b9aee7831dcefe6553011aabef804ca0a531c54d8  guix-build-a24ef27cfe6e/output/powerpc64-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64-linux-gnu.tar.gz
    1115031a61fbb3cc9495f274a85241aa4708aef3564a66faaaccfd35fcb51e5f3c  guix-build-a24ef27cfe6e/output/powerpc64le-linux-gnu/SHA256SUMS.part
    12302041c21942edb8c0de8aa4af6105338c82ffead5ad57947c0fdd99f1f66ce7  guix-build-a24ef27cfe6e/output/powerpc64le-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64le-linux-gnu-debug.tar.gz
    130f6b18d72109efd249abdae611d57b94a725863a4e8ab91b07b9199d9e5e3e86  guix-build-a24ef27cfe6e/output/powerpc64le-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64le-linux-gnu.tar.gz
    14d3e84416a8dd90427d028390357cb9fbf98aabc1e97210afdcb26ff7b7656b93  guix-build-a24ef27cfe6e/output/riscv64-linux-gnu/SHA256SUMS.part
    15564e353892b5952889e62f946fe6045f4b348fa66712f7cb06262aca8bd7fbc8  guix-build-a24ef27cfe6e/output/riscv64-linux-gnu/bitcoin-a24ef27cfe6e-riscv64-linux-gnu-debug.tar.gz
    1629fc019a6c96be6a6f9190e2661be9b4c4d2da7b530ee8815be145cdfa11902a  guix-build-a24ef27cfe6e/output/riscv64-linux-gnu/bitcoin-a24ef27cfe6e-riscv64-linux-gnu.tar.gz
    173a9e1d03eb6691138f193da68e355638d4db4646b3f674ea1645358cf55a49f2  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/SHA256SUMS.part
    185f02de0e7149b70b6fe612cc382e27c3e8691a2c8d05730604ea92410843d62c  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/bitcoin-a24ef27cfe6e-x86_64-apple-darwin-unsigned.dmg
    198923d5f2b08b64fd53796db4ef90a631b8b1c15908971ae334d7ba35437e0f19  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/bitcoin-a24ef27cfe6e-x86_64-apple-darwin-unsigned.tar.gz
    20adc74b896eba9eb6b6ef5da0d909f2d3c529a23b55fff4c8af4465b277b46217  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/bitcoin-a24ef27cfe6e-x86_64-apple-darwin.tar.gz
    21faff9251c2d7cdd4336ab23baa34b9c52083018d5302eb3e7aa807926ef6b2b8  guix-build-a24ef27cfe6e/output/x86_64-linux-gnu/SHA256SUMS.part
    2292c72070e2c95aad4ad16434b7eadef7ebdbbaa1de262ad968d4fa8396e801c4  guix-build-a24ef27cfe6e/output/x86_64-linux-gnu/bitcoin-a24ef27cfe6e-x86_64-linux-gnu-debug.tar.gz
    23259f6213e0ecb0f4d01d2c106142602e7772c1b09a15ff6cf395d2f9be571787  guix-build-a24ef27cfe6e/output/x86_64-linux-gnu/bitcoin-a24ef27cfe6e-x86_64-linux-gnu.tar.gz
    2422cf628aad35d18206a87514a9833acc0af79572ecba847aa59c2b2dec1be799  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/SHA256SUMS.part
    2529cbe82b770d6db0ab295ff0ac2614584de5fc5cc79dc4f8f8d9918f359795dc  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64-debug.zip
    26d19c8cbb2b3359ebf0b66dada69f3a88eb41c0945c0e2b847bc2684f1c3d1985  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64-setup-unsigned.exe
    275797bb51c61b2857c0912e205bc886a29bc537076da00bba4c3e27c479d23c9c  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64-unsigned.tar.gz
    2856ac734a7007d5565bee6147bc4219e0750210dae8188b602f12d4243a437fac  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64.zip
    
  2. fanquake added the label Build system on Mar 31, 2022
  3. fanquake added the label DrahtBot Guix build requested on Mar 31, 2022
  4. hebasto commented at 11:11 am on March 31, 2022: member
    Concept ACK.
  5. laanwj added the label Upstream on Mar 31, 2022
  6. hebasto changes_requested
  7. hebasto commented at 1:49 pm on March 31, 2022: member

    Approach NACK f530cc01950f3de06de9dea57d2a75782957db22

    Why do not backport the upstream commit:

     0$ cat depends/patches/qt/duplicate_lcqpafonts.patch 
     1QtGui: Fix duplication of logging category lcQpaFonts
     2
     3Move it to qplatformfontdatabase.h.
     4
     5Upstream commit:
     6 - Qt 6.0: ab01885e48873fb2ad71841a3f1627fe4d9cd835
     7
     8--- a/qtbase/src/gui/text/qplatformfontdatabase.cpp
     9+++ b/qtbase/src/gui/text/qplatformfontdatabase.cpp
    10@@ -52,6 +52,8 @@
    11 
    12 QT_BEGIN_NAMESPACE
    13 
    14+Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts")
    15+
    16 void qt_registerFont(const QString &familyname, const QString &stylename,
    17                      const QString &foundryname, int weight,
    18                      QFont::Style style, int stretch, bool antialiased,
    19
    20--- a/qtbase/src/gui/text/qplatformfontdatabase.h
    21+++ b/qtbase/src/gui/text/qplatformfontdatabase.h
    22@@ -50,6 +50,7 @@
    23 //
    24 
    25 #include <QtGui/qtguiglobal.h>
    26+#include <QtCore/qloggingcategory.h>
    27 #include <QtCore/QString>
    28 #include <QtCore/QStringList>
    29 #include <QtCore/QList>
    30@@ -62,6 +63,7 @@
    31 
    32 QT_BEGIN_NAMESPACE
    33 
    34+Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
    35 
    36 class QWritingSystemsPrivate;
    37 
    38
    39--- a/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
    40+++ b/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
    41@@ -86,8 +86,6 @@
    42 
    43 QT_BEGIN_NAMESPACE
    44 
    45-Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts")
    46-
    47 static float SYNTHETIC_ITALIC_SKEW = std::tan(14.f * std::acos(0.f) / 90.f);
    48 
    49 bool QCoreTextFontEngine::ct_getSfntTable(void *user_data, uint tag, uchar *buffer, uint *length)
    50
    51--- a/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
    52+++ b/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
    53@@ -64,8 +64,6 @@
    54 
    55 QT_BEGIN_NAMESPACE
    56 
    57-Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
    58-
    59 class QCoreTextFontEngine : public QFontEngine
    60 {
    61     Q_GADGET
    62
    63--- a/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
    64+++ b/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
    65@@ -68,8 +68,6 @@
    66 
    67 QT_BEGIN_NAMESPACE
    68 
    69-Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts")
    70-
    71 #ifndef QT_NO_DIRECTWRITE
    72 // ### fixme: Consider direct linking of dwrite.dll once Windows Vista pre SP2 is dropped (QTBUG-49711)
    73 
    74
    75--- a/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
    76+++ b/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
    77@@ -63,8 +63,6 @@
    78 
    79 QT_BEGIN_NAMESPACE
    80 
    81-Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
    82-
    83 class QWindowsFontEngineData
    84 {
    85     Q_DISABLE_COPY_MOVE(QWindowsFontEngineData)
    

    ?

    This approach does not introduce new symbols, and it is more manageable during Qt update in the future.

    FWIW, tested it with #21778.

  8. fanquake force-pushed on Mar 31, 2022
  9. fanquake commented at 2:27 pm on March 31, 2022: member

    Why do not backport the upstream commit:

    Ok, now using that.

  10. hebasto approved
  11. hebasto commented at 2:39 pm on March 31, 2022: member

    ~ACK e351412ff0fc24b797ec2623812f0454f260b586~

    EDIT: unfortunately, CentOS CI fails (

    nit: missed EOL

    Screenshot from 2022-03-31 16-38-42

  12. hebasto commented at 2:49 pm on March 31, 2022: member

    FWIW, tested it with #21778.

    Sorry, was building only for macOS, did not test linux builds.

  13. fanquake force-pushed on Mar 31, 2022
  14. fanquake commented at 2:56 pm on March 31, 2022: member

    Sorry, was building only for macOS, did not test linux builds.

    Ok. Reverted back to my original change.

  15. hebasto commented at 5:18 pm on March 31, 2022: member

    FWIW, tested it with #21778.

    Sorry, was building only for macOS, did not test linux builds.

    A fixed patch has been suggested in https://github.com/hebasto/bitcoin/commits/pr21778/0331-test.

  16. build: patch around qt duplicate symbol issue
    This is currently causing the same failure in two different PRs:
    ```bash
    duplicate symbol 'lcQpaFonts()' in:
        /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5ThemeSupport.a(qgenericunixthemes.o)
        /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5FontDatabaseSupport.a(qfontengine_coretext.o)
    ld: 1 duplicate symbol for architecture x86_64
    ```
    
    ```bash
    x86_64-apple-darwin-ld: error: duplicate symbol: __Z10lcQpaFontsv
    >>> defined in /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5ThemeSupport.a(qgenericunixthemes.o)
    >>> defined in /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5FontDatabaseSupport.a(qfontengine_coretext.o)
    ```
    
    Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
    a24ef27cfe
  17. fanquake force-pushed on Mar 31, 2022
  18. fanquake commented at 8:25 pm on March 31, 2022: member

    A fixed patch has been suggested in https://github.com/hebasto/bitcoin/commits/pr21778/0331-test.

    Ok. I’ve re-reverted.

  19. hebasto commented at 1:02 pm on April 1, 2022: member

    Guix builds x86_64:

     0$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
     182dd305045fa908d3a5909c8f7827e4ab607281b84706e0722d32e4c1c507cef  guix-build-a24ef27cfe6e/output/aarch64-linux-gnu/SHA256SUMS.part
     2dadef04a291a1e371cac7eef0056948180fcad86ba77f9fc7b844b389461bbe1  guix-build-a24ef27cfe6e/output/aarch64-linux-gnu/bitcoin-a24ef27cfe6e-aarch64-linux-gnu-debug.tar.gz
     367842aef90a56be203388a6838b95d6f472d018fdbf399b12b9e0b577e101651  guix-build-a24ef27cfe6e/output/aarch64-linux-gnu/bitcoin-a24ef27cfe6e-aarch64-linux-gnu.tar.gz
     4bef26de8cdd47853c1bca34e2cf002a9734394a7a3e027aba1b713738b4a3794  guix-build-a24ef27cfe6e/output/arm-linux-gnueabihf/SHA256SUMS.part
     55198227d1b7801032f358da348bc577a4d99273b0ecca50b83ad1b3d5d2f9d92  guix-build-a24ef27cfe6e/output/arm-linux-gnueabihf/bitcoin-a24ef27cfe6e-arm-linux-gnueabihf-debug.tar.gz
     697656b94a4b8bedd87a8a2d11e032d01f6cb22fa22f26e047deab9fc70886733  guix-build-a24ef27cfe6e/output/arm-linux-gnueabihf/bitcoin-a24ef27cfe6e-arm-linux-gnueabihf.tar.gz
     7ea0b7fa4458d36c349d7b56813c75a1957bb904945265bd26f970a5b6f8a1817  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/SHA256SUMS.part
     8f7741dc1baf0e59713f42fef8b53e613fef62abbeef9ca5c8187b04b7a81054f  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/bitcoin-a24ef27cfe6e-arm64-apple-darwin-unsigned.dmg
     97d27ebc99af2a35ee21736dc13adf76c5e646a3b5c00cf6a4bf56077b1ce0db4  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/bitcoin-a24ef27cfe6e-arm64-apple-darwin-unsigned.tar.gz
    10ae47461a03cff74d8e9e575c52148d1378ed883f41557cdf57f626532adfd60e  guix-build-a24ef27cfe6e/output/arm64-apple-darwin/bitcoin-a24ef27cfe6e-arm64-apple-darwin.tar.gz
    1114f55113414fa633e4499cd83ebed9f1f4d9a36e0ab2ec550cbba159d00d1de8  guix-build-a24ef27cfe6e/output/dist-archive/bitcoin-a24ef27cfe6e.tar.gz
    12a2834efc9b7ac1545e442f5b527b1a739713b399c3591cfa4ac07d30a858017f  guix-build-a24ef27cfe6e/output/powerpc64-linux-gnu/SHA256SUMS.part
    13720120e641fe527dbe1f6979e3ed0222238f79a0cfac067838bc91739aa3f2d9  guix-build-a24ef27cfe6e/output/powerpc64-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64-linux-gnu-debug.tar.gz
    14e150946434a4f0b59b7dfdec65d02a2db4290b3e7f5eade1141905ef56b7587b  guix-build-a24ef27cfe6e/output/powerpc64-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64-linux-gnu.tar.gz
    151255c0e22087042f2262acc3f7d043659a9a2cbd0767b65ba355f89bc4589915  guix-build-a24ef27cfe6e/output/powerpc64le-linux-gnu/SHA256SUMS.part
    1643152dcfcff13d60c5f6fbfaed328643e6a18d43f1f0935742732080e142e40d  guix-build-a24ef27cfe6e/output/powerpc64le-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64le-linux-gnu-debug.tar.gz
    1741ec8e457921ecf4241209015441bcf6ced53e1430f5637aef0ed837de175dfb  guix-build-a24ef27cfe6e/output/powerpc64le-linux-gnu/bitcoin-a24ef27cfe6e-powerpc64le-linux-gnu.tar.gz
    185edeefb9479d14ff8b2f6c40390ae6a8995d42238be56c1edd2c462d065fb1e7  guix-build-a24ef27cfe6e/output/riscv64-linux-gnu/SHA256SUMS.part
    19f037d4cc378da0c00b10f2960cb853377b2c0710aba4ed17c8f10ff9e8ab2cd8  guix-build-a24ef27cfe6e/output/riscv64-linux-gnu/bitcoin-a24ef27cfe6e-riscv64-linux-gnu-debug.tar.gz
    20793d0f8710e300adb6aff2e289370fb71c60d5d844970161898c359f3dea0f2f  guix-build-a24ef27cfe6e/output/riscv64-linux-gnu/bitcoin-a24ef27cfe6e-riscv64-linux-gnu.tar.gz
    21caeed20b8b301abdd32cb82c290ef77b283eb7b9f341254cdcf846f6d85365a9  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/SHA256SUMS.part
    225f02de0e7149b70b6fe612cc382e27c3e8691a2c8d05730604ea92410843d62c  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/bitcoin-a24ef27cfe6e-x86_64-apple-darwin-unsigned.dmg
    230f5a5041a12061e4e9f5fcfc803cd2a98636d964845a76713d83575caef5a4f6  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/bitcoin-a24ef27cfe6e-x86_64-apple-darwin-unsigned.tar.gz
    24adc74b896eba9eb6b6ef5da0d909f2d3c529a23b55fff4c8af4465b277b46217  guix-build-a24ef27cfe6e/output/x86_64-apple-darwin/bitcoin-a24ef27cfe6e-x86_64-apple-darwin.tar.gz
    2557a56059e4054e5becdbc36a6765f3b209535a78d4fa3f8a932d65e6b12d9c05  guix-build-a24ef27cfe6e/output/x86_64-linux-gnu/SHA256SUMS.part
    265c163f6c9936307b139fcc91e9a129e144c7961b44e11b245b0c9402b6b919a8  guix-build-a24ef27cfe6e/output/x86_64-linux-gnu/bitcoin-a24ef27cfe6e-x86_64-linux-gnu-debug.tar.gz
    277c1f9370fe8e26e3363198f3cd3f1d817662bc944f873138bcff997cda2d3c25  guix-build-a24ef27cfe6e/output/x86_64-linux-gnu/bitcoin-a24ef27cfe6e-x86_64-linux-gnu.tar.gz
    280708072d2c81ed5e7d54bfec350d8737931e13bd9291bdb72925c096be33f186  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/SHA256SUMS.part
    290b9b931fb4902a2779a193ca96fee01d1790644a004cd8898e24f008799d1a24  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64-debug.zip
    30d19c8cbb2b3359ebf0b66dada69f3a88eb41c0945c0e2b847bc2684f1c3d1985  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64-setup-unsigned.exe
    315797bb51c61b2857c0912e205bc886a29bc537076da00bba4c3e27c479d23c9c  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64-unsigned.tar.gz
    32131d9aff0d9c72f1d27cac728b7fdd42f6e961214eec330fc38e1d644869b6f8  guix-build-a24ef27cfe6e/output/x86_64-w64-mingw32/bitcoin-a24ef27cfe6e-win64.zip
    
  20. hebasto approved
  21. hebasto commented at 1:04 pm on April 1, 2022: member
    ACK a24ef27cfe6e28979cdc33382d69a979367febff
  22. fanquake merged this on Apr 1, 2022
  23. fanquake closed this on Apr 1, 2022

  24. fanquake deleted the branch on Apr 1, 2022
  25. DrahtBot commented at 2:06 pm on April 1, 2022: member

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

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #24668 (build, qt: bump Qt5 version to 5.15.3 by prusnak)
    • #24391 (build: stop overriding user autoconf flags by fanquake)
    • #21778 (build: LLVM 14 & 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.

  26. in depends/packages/qt.mk:16 in a24ef27cfe
    12@@ -13,7 +13,7 @@ $(package)_patches += dont_use_avx_android_x86_64.patch dont_hardcode_x86_64.pat
    13 $(package)_patches += fix_android_jni_static.patch dont_hardcode_pwd.patch
    14 $(package)_patches += qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
    15 $(package)_patches += fix_bigsur_style.patch use_android_ndk23.patch
    16-$(package)_patches += rcc_hardcode_timestamp.patch
    17+$(package)_patches += rcc_hardcode_timestamp.patch duplicate_lcqpafonts.patch
    


    prusnak commented at 2:52 pm on April 1, 2022:
    Can we use one patch per line next time, please?
  27. DrahtBot commented at 5:38 pm on April 2, 2022: member

    Guix builds

    File commit 1a54c060b3b30220ec40a4b3cc4a0eb43586e982(master) commit fbe2a3f72fa915bfa889134e80e9f1cc4d9b14fd(master and this pull)
    SHA256SUMS.part bffaae95c9b700ac... c30863b074077170...
    *-aarch64-linux-gnu-debug.tar.gz 82b9ebf8b1408349... 509fd888bb4e2930...
    *-aarch64-linux-gnu.tar.gz 41df6a28f176a570... d165d57988c6d737...
    *-arm-linux-gnueabihf-debug.tar.gz 562d60a38050a57e... 915afc17d970c0f8...
    *-arm-linux-gnueabihf.tar.gz a3ce174d1b85975d... 2506a98d7d85b9cc...
    *-arm64-apple-darwin-unsigned.dmg 2d61bc717a85d115... 06788ca3dabab058...
    *-arm64-apple-darwin-unsigned.tar.gz 481bd89de9d37477... c04eaab7843396c6...
    *-arm64-apple-darwin.tar.gz 00e5560fc575e52d... 16cde7396b275601...
    *-powerpc64-linux-gnu-debug.tar.gz ad48bc3250bec98e... 54297943e12d9c7a...
    *-powerpc64-linux-gnu.tar.gz b5b37090b6544f94... ed2aa18e21ba5e3a...
    *-powerpc64le-linux-gnu-debug.tar.gz cad227c0f3102883... ddd35a82a20364a8...
    *-powerpc64le-linux-gnu.tar.gz 91bb4973e374e227... 1694bced93ebe83d...
    *-riscv64-linux-gnu-debug.tar.gz d78c521f02573f42... 0697462c55505bf0...
    *-riscv64-linux-gnu.tar.gz ace83bdc3a4ce594... 803e993303678505...
    *-win64-debug.zip f7013d3f1fdce85b... 963928a7675a2fda...
    *-win64-setup-unsigned.exe f5d35f796509960a... a7e7de2dd13c6287...
    *-win64-unsigned.tar.gz 7414d20470a751f1... 3809f21776971bc8...
    *-win64.zip 2ff99ea1e6ee3e7d... 33a456413b98195d...
    *-x86_64-apple-darwin-unsigned.dmg 637f820c47cb0676... 3f018b50f2b60453...
    *-x86_64-apple-darwin-unsigned.tar.gz 6acf8c650c5c4222... 3056f9754425bb0e...
    *-x86_64-apple-darwin.tar.gz 8d8d208ca2b0f4df... 44667fc5c69572f0...
    *-x86_64-linux-gnu-debug.tar.gz 43f4223dc95d752a... 7d6cf4c220f6fe96...
    *-x86_64-linux-gnu.tar.gz 96ccc43790171174... db5edeb14a123078...
    *.tar.gz 6c3a0ad29dac027c... 9c5a01bf7a1c5af4...
    guix_build.log 92c6d7928257143e... 7cae278312b93e1f...
    guix_build.log.diff 43da9358a8905d3d...
  28. DrahtBot removed the label DrahtBot Guix build requested on Apr 2, 2022
  29. sidhujag referenced this in commit c2266a52f5 on Apr 3, 2022
  30. DrahtBot locked this on Apr 2, 2023

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-24 15:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me