build: Bump AX_PTHREAD macro to the latest version #23616
Merged
Conversation
This file contains 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
hebasto
force-pushed
the
211128-pthread
branch
from
be7b343 to
372f061
Compare
Guix builds: |
|
A second build gives me the same hashes as @hebasto, here are the updated hashes: |
Is nondeterminism for aarch64 reproducible for you? (builds are still deterministic for me when using different systems to build). |
|
@hebasto a subsequent build gives me your hashes. I seem to consistently get an issue with aarch64 periodically bringing up inconsistent hashes; must be my computer. Will update my guix hashes. |
laanwj
reviewed
Dec 7, 2021
| @@ -482,18 +487,28 @@ if test "x$ax_pthread_ok" = "xyes"; then | |||
| [#handle absolute path differently from PATH based program lookup | |||
| AS_CASE(["x$CC"], | |||
| [x/*], | |||
| [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], | |||
| [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) | |||
| [ | |||
There was a problem hiding this comment.
I think a copy/paste error happened here with regard to indentation. Comparing to the source file https://raw.githubusercontent.com/autoconf-archive/autoconf-archive/6c25681d78d963708362ea0d4d63ee9b508782b6/m4/ax_pthread.m4 yields a diff here.
There was a problem hiding this comment.
Ah, they use tabs. How annoying!
Nonetheless, going to push an updated branch.
There was a problem hiding this comment.
Updated. Is it ok now?
No. It still differs from upstream.
diff --git a/build-aux/m4/ax_pthread.m4 b/build-aux/m4/ax_pthread.m4
index 9f35d13914..2b2e1d9a4f 100644
--- a/build-aux/m4/ax_pthread.m4
+++ b/build-aux/m4/ax_pthread.m4
@@ -488,13 +488,13 @@ if test "x$ax_pthread_ok" = "xyes"; then
AS_CASE(["x$CC"],
[x/*],
[
- AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])
- AS_IF([test "x${CXX}" != "x"], [AS_IF([AS_EXECUTABLE_P([${CXX}_r])],[PTHREAD_CXX="${CXX}_r"])])
- ],
+ AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])
+ AS_IF([test "x${CXX}" != "x"], [AS_IF([AS_EXECUTABLE_P([${CXX}_r])],[PTHREAD_CXX="${CXX}_r"])])
+ ],
[
- AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])
- AS_IF([test "x${CXX}" != "x"], [AC_CHECK_PROGS([PTHREAD_CXX],[${CXX}_r],[$CXX])])
- ]
+ AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])
+ AS_IF([test "x${CXX}" != "x"], [AC_CHECK_PROGS([PTHREAD_CXX],[${CXX}_r],[$CXX])])
+ ]
)
])
;;There was a problem hiding this comment.
No. It still differs from upstream.
Could it be due to tab/space settings in your environment?
In my editor the diff looks like that:
There was a problem hiding this comment.
$ diff -u autoconf-archive/m4/ax_pthread.m4 bitcoin/build-aux/m4/ax_pthread.m4
is empty.
There was a problem hiding this comment.
Could it be due to tab/space settings in your environment?
Sorry, I must still have been comparing the previous branch. This looks ok now.
Editors and tabs-versus-spaces etc should all be irrelevant here. "Updating" this file should be as boring as:
curl https://git.savannah.gnu.org/gitweb/\?p\=autoconf-archive.git\;a\=blob_plain\;f\=m4/ax_pthread.m4 -o build-aux/m4/ax_pthread.m4
This change silents autoconf >2.69 warnings about the obsolete $as_echo.
hebasto
force-pushed
the
211128-pthread
branch
from
372f061 to
d796091
Compare
fanquake
approved these changes
Dec 8, 2021
There was a problem hiding this comment.
ACK d796091 - matches upstream at serial 31.
Guix build:
bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
72eb530e439274f1615d2847a5b33661543c3308bc0aa777b11194ceb753e335 guix-build-d796091b04f3/output/aarch64-linux-gnu/SHA256SUMS.part
1f47cf31a795d7a4bfbdf8e8680f0c8fd214d817d4472606ab5778cc30acd5d8 guix-build-d796091b04f3/output/aarch64-linux-gnu/bitcoin-d796091b04f3-aarch64-linux-gnu-debug.tar.gz
cef3b67a922d43d20fc70426725f72db95e1a032acec5d53cbc5df70866de555 guix-build-d796091b04f3/output/aarch64-linux-gnu/bitcoin-d796091b04f3-aarch64-linux-gnu.tar.gz
5db41ee0bbc676bb830a92ba5e36c84c358fbfd475a3a1f80938c2f6958f5609 guix-build-d796091b04f3/output/arm-linux-gnueabihf/SHA256SUMS.part
fe950d1dfe7126fdf5feb5b4c2c39290c1295bdcffd205a65818d68f069fdb39 guix-build-d796091b04f3/output/arm-linux-gnueabihf/bitcoin-d796091b04f3-arm-linux-gnueabihf-debug.tar.gz
e29d8f6d5ca0ecf379b2f23441ec069e653bc61a7169f1580ea9c115f1a80398 guix-build-d796091b04f3/output/arm-linux-gnueabihf/bitcoin-d796091b04f3-arm-linux-gnueabihf.tar.gz
cec148f66c7974d6e49949d975eead7724185d7f9a2573e58d89ca2674dadc35 guix-build-d796091b04f3/output/dist-archive/bitcoin-d796091b04f3.tar.gz
289fe0eb95853af85cf37f1d550fee4267e474e3940624fcc2b574d4d9bb8a23 guix-build-d796091b04f3/output/powerpc64-linux-gnu/SHA256SUMS.part
73b587482273d056e98ec9298453e3d0186cd3c5eeaf90af3208362e6ae0dee7 guix-build-d796091b04f3/output/powerpc64-linux-gnu/bitcoin-d796091b04f3-powerpc64-linux-gnu-debug.tar.gz
1aa0bc88484eb4fc3e6b782e454105a38c15e874380ed4de393ce8cc57668d5b guix-build-d796091b04f3/output/powerpc64-linux-gnu/bitcoin-d796091b04f3-powerpc64-linux-gnu.tar.gz
8693e4e4868710c9f29234fc85ebd15c07ea019faf7211726a566866e895cd74 guix-build-d796091b04f3/output/powerpc64le-linux-gnu/SHA256SUMS.part
824975ad918b1fec97384721c39c4cfd58e74e0b4db5ac403387ead33c3e9054 guix-build-d796091b04f3/output/powerpc64le-linux-gnu/bitcoin-d796091b04f3-powerpc64le-linux-gnu-debug.tar.gz
99dafd2f613c54c546dafd6e46e06042e9cf32b7c1d9754f68fc6daf95a68cbc guix-build-d796091b04f3/output/powerpc64le-linux-gnu/bitcoin-d796091b04f3-powerpc64le-linux-gnu.tar.gz
2a66d541a418354fbe15bb5673340b31d929c66d6c4db2c7dfd2678953cad2ee guix-build-d796091b04f3/output/riscv64-linux-gnu/SHA256SUMS.part
839b23a59461fca1a341649db1495eb97f05d905c1d679ce81eb1b259b3d0668 guix-build-d796091b04f3/output/riscv64-linux-gnu/bitcoin-d796091b04f3-riscv64-linux-gnu-debug.tar.gz
575c214a906eb424ec370cb7c9915bbba470b6307e5fec8b1d524d3cbe150a6d guix-build-d796091b04f3/output/riscv64-linux-gnu/bitcoin-d796091b04f3-riscv64-linux-gnu.tar.gz
1a0ac09916179ff404e864f7297980fc9e869edef3519fd07d11322e1339c4a1 guix-build-d796091b04f3/output/x86_64-apple-darwin19/SHA256SUMS.part
8db4ea0a22c8d378e848497f781b00ac6125fed0884400d84415ff4969187606 guix-build-d796091b04f3/output/x86_64-apple-darwin19/bitcoin-d796091b04f3-osx-unsigned.dmg
0ca3f18693f55682b604db8ef7ee56eae928cb231468d7c0fadb721351ba6d4c guix-build-d796091b04f3/output/x86_64-apple-darwin19/bitcoin-d796091b04f3-osx-unsigned.tar.gz
c2779a238660020999f584336f3b10edb36c2b133e92f1b3e52eb82ecd92eb83 guix-build-d796091b04f3/output/x86_64-apple-darwin19/bitcoin-d796091b04f3-osx64.tar.gz
13a94aa9ac789800bffde339f1ae404e670825826a01e8b9894bdff80e733ff8 guix-build-d796091b04f3/output/x86_64-linux-gnu/SHA256SUMS.part
c19f78dffb0a42ce0f1aee7070ca28c4ca36c32c3496899bf197232015c32547 guix-build-d796091b04f3/output/x86_64-linux-gnu/bitcoin-d796091b04f3-x86_64-linux-gnu-debug.tar.gz
846e2aea18213b9cdd2b237e243474fa2db94b6f9a8d00d5b451171c7e256e66 guix-build-d796091b04f3/output/x86_64-linux-gnu/bitcoin-d796091b04f3-x86_64-linux-gnu.tar.gz
814c2f4b1ca09559459813fbedf664b794d43d591853038a12e47329d23779de guix-build-d796091b04f3/output/x86_64-w64-mingw32/SHA256SUMS.part
67f0537e49337df3e5b480b30a8acac1138700403e88fa0159e3099a38e9d3d2 guix-build-d796091b04f3/output/x86_64-w64-mingw32/bitcoin-d796091b04f3-win-unsigned.tar.gz
968aff6dfcb2eb116247bd79bb26a7f8df16e39151b26758b94319a6421d25f7 guix-build-d796091b04f3/output/x86_64-w64-mingw32/bitcoin-d796091b04f3-win64-debug.zip
06632cc4d9d658a7aa9948ed2524ac78c3fef13842c587561ba8c07d4b573a93 guix-build-d796091b04f3/output/x86_64-w64-mingw32/bitcoin-d796091b04f3-win64-setup-unsigned.exe
230c33aa5a834b0f977579d86dbc184938408963f6d9fa1de81aecc332edf3b4 guix-build-d796091b04f3/output/x86_64-w64-mingw32/bitcoin-d796091b04f3-win64.zip
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Dec 8, 2021
d796091 build: Bump AX_PTHREAD macro to the latest version (Hennadii Stepanov) Pull request description: This PR silents autoconf >2.69 (this [one](https://formulae.brew.sh/formula/autoconf), for instance) warnings about the obsolete `$as_echo`: ``` % ./autogen.sh ... configure.ac:847: warning: $as_echo is obsolete; use AS_ECHO(["message"]) instead lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from... lib/m4sugar/m4sh.m4:699: AS_IF is expanded from... ./lib/autoconf/general.m4:2249: AC_CACHE_VAL is expanded from... ./lib/autoconf/general.m4:2270: AC_CACHE_CHECK is expanded from... build-aux/m4/ax_pthread.m4:89: AX_PTHREAD is expanded from... configure.ac:847: the top level ... ``` No other behavior changes. ACKs for top commit: fanquake: ACK d796091 - matches upstream at serial 31. Tree-SHA512: aa9b60698f453427221444a5a63420d833c4c5dd23f8b0c74e5bd4639daec9c6cff0907a5281c00103ccb030e394998cf05653be750d4a3bf0f37ca41ff6fbe1
RandyMcMillan
pushed a commit
to RandyMcMillan/mempool-tab
that referenced
this pull request
Dec 23, 2021
…st version 2a8150c build: Bump AX_PTHREAD macro to the latest version (Hennadii Stepanov) Pull request description: This PR silents autoconf >2.69 (this [one](https://formulae.brew.sh/formula/autoconf), for instance) warnings about the obsolete `$as_echo`: ``` % ./autogen.sh ... configure.ac:847: warning: $as_echo is obsolete; use AS_ECHO(["message"]) instead lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from... lib/m4sugar/m4sh.m4:699: AS_IF is expanded from... ./lib/autoconf/general.m4:2249: AC_CACHE_VAL is expanded from... ./lib/autoconf/general.m4:2270: AC_CACHE_CHECK is expanded from... build-aux/m4/ax_pthread.m4:89: AX_PTHREAD is expanded from... configure.ac:847: the top level ... ``` No other behavior changes. ACKs for top commit: fanquake: ACK 2a8150c - matches upstream at serial 31. Tree-SHA512: aa9b60698f453427221444a5a63420d833c4c5dd23f8b0c74e5bd4639daec9c6cff0907a5281c00103ccb030e394998cf05653be750d4a3bf0f37ca41ff6fbe1
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.
This PR silents autoconf >2.69 (this one, for instance) warnings about the obsolete
$as_echo:No other behavior changes.