mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
088342b617
797b3ed9090030f32fade81803b580562d4a90a3 script: remove gitian reference from symbol-check.py (fanquake) 15fc9a0299091bfeb3370f993ad95ff638f6ba8c guix: add additional documentation to patches (fanquake) 4516e5ec9223486fe2eba7f4320d786d074a58fd lint: exclude Guix patches from spell-checking (fanquake) de6ca41a52d2646598daae5f4620bbe766757e21 guix: no-longer pass --enable-glibc-back-compat to Guix (fanquake) 84dd81fb5bf7308b8070b53520266854fb6efad3 build: remove glibc backcompat requirement for Linux symbol checks (fanquake) Pull request description: Now that our Guix toolchains are based on glibc 2.24 and 2.27 (RISCV), we don't need to use the `--enable-glibc-back-compat` option to produce binaries that don't use any symbols from glibc 2.17 and 2.27 or later. This also adds additional documentation to some Guix patches (pointed out in #22365) and removes Guix patches from the spelling linter, because that isn't our spelling. Symbol usage: https://gist.github.com/fanquake/d15604fc580718444c5aa4b3c3c75fdc. Guix Builds: ```bash 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 ed54e6a6cf4fab328557c0c72eb08c73f2a58c6c70959544cf4b1882e75ea69e guix-build-797b3ed90900/output/aarch64-linux-gnu/SHA256SUMS.part 83bd9dadc59f89f848d143fa4fc3964f16fe0b4bdf35e5093b577ff2c4bd1f43 guix-build-797b3ed90900/output/aarch64-linux-gnu/bitcoin-797b3ed90900-aarch64-linux-gnu-debug.tar.gz 94cb8c35281f12dec6ea5b390b66cad5e27ac8c45a30c42c8d38c438695d54c0 guix-build-797b3ed90900/output/aarch64-linux-gnu/bitcoin-797b3ed90900-aarch64-linux-gnu.tar.gz 7318b63d65c0aa52d2446de8e1f40658d2e47ab8fb0268820c3b7585d140fb23 guix-build-797b3ed90900/output/arm-linux-gnueabihf/SHA256SUMS.part 95e1ffb372964b73f539653ca703b70cf0c018801a9c4c0ffc46a0b63539253c guix-build-797b3ed90900/output/arm-linux-gnueabihf/bitcoin-797b3ed90900-arm-linux-gnueabihf-debug.tar.gz 039d3842e6499626cf955ae0a7590dd6b3d0935cdc217c98aaf9d156b0ebd3b4 guix-build-797b3ed90900/output/arm-linux-gnueabihf/bitcoin-797b3ed90900-arm-linux-gnueabihf.tar.gz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 guix-build-797b3ed90900/output/dist-archive/SKIPATTEST.TAG 2c4e7b6e7aff63ba811e5bf59362d16866c3a358f8844fba8739a61192870622 guix-build-797b3ed90900/output/dist-archive/bitcoin-797b3ed90900.tar.gz 955029b949c368eabd517dd33040d2f01e2ac6a55e7b4f9107907a7c6e0c6060 guix-build-797b3ed90900/output/powerpc64-linux-gnu/SHA256SUMS.part fd6d6b137f8efedf58a879d11205b1d4649e1f97d7f91e193239ef206fcc285d guix-build-797b3ed90900/output/powerpc64-linux-gnu/bitcoin-797b3ed90900-powerpc64-linux-gnu-debug.tar.gz 51736ac8e77737999f1b5bd4c381b0016f19a8d5e40e786fe941ff04e84c11c9 guix-build-797b3ed90900/output/powerpc64-linux-gnu/bitcoin-797b3ed90900-powerpc64-linux-gnu.tar.gz 8c244c16bfa46c1efdb120e1d91fdd14d3f14eefee8d7e1fbb0a9b4664a5c315 guix-build-797b3ed90900/output/powerpc64le-linux-gnu/SHA256SUMS.part 704ee593251a1b1c65a5bebeef93b23f266af4e8cbf8ae556150c3b2e8f06a6c guix-build-797b3ed90900/output/powerpc64le-linux-gnu/bitcoin-797b3ed90900-powerpc64le-linux-gnu-debug.tar.gz 0ec06ae7d344de20d61e3965d8b383747ef20b0e9d93a3165733ea23bdf2ead8 guix-build-797b3ed90900/output/powerpc64le-linux-gnu/bitcoin-797b3ed90900-powerpc64le-linux-gnu.tar.gz 2dd6c6ecc67b0ea40ca9c43f92efca81ccd054b8db8c197ad84ad9674d510a25 guix-build-797b3ed90900/output/riscv64-linux-gnu/SHA256SUMS.part 5ebb27a855a677f7a188d83995be6b2a3ea8606be152abb7fc7832713fb0677a guix-build-797b3ed90900/output/riscv64-linux-gnu/bitcoin-797b3ed90900-riscv64-linux-gnu-debug.tar.gz bdaf1783f5e1861597afa37c1880364e118d9a7a7af8017302d82202791019f6 guix-build-797b3ed90900/output/riscv64-linux-gnu/bitcoin-797b3ed90900-riscv64-linux-gnu.tar.gz 726c9092b60ac2e7d7e14b2c24467fcf276a6f89170a871ddab9dce6ac230699 guix-build-797b3ed90900/output/x86_64-apple-darwin18/SHA256SUMS.part 2af4d709b44952654f3c08c86593bf2ccc9a44ed422783a1b95b8a199a894db2 guix-build-797b3ed90900/output/x86_64-apple-darwin18/bitcoin-797b3ed90900-osx-unsigned.dmg fd49ba445aa6cf3d8c47019a05e9e5740cb0f53349344dd80671297127f49f1a guix-build-797b3ed90900/output/x86_64-apple-darwin18/bitcoin-797b3ed90900-osx-unsigned.tar.gz 3f51cbf8cf18420d4be70e656aa993675cf5e828a255c2030047ae2e059ed5b7 guix-build-797b3ed90900/output/x86_64-apple-darwin18/bitcoin-797b3ed90900-osx64.tar.gz afd1edee1447bb88d81e972abfae4c4e065b5b1827769f033cff9472084c7c1b guix-build-797b3ed90900/output/x86_64-linux-gnu/SHA256SUMS.part ec468ef886d25e685f4f7a18b4f7d497dedf757495e0d5beb72c23cc32ab69b5 guix-build-797b3ed90900/output/x86_64-linux-gnu/bitcoin-797b3ed90900-x86_64-linux-gnu-debug.tar.gz 1934d7294f0c9e083d38a3f68d4a61cd679defa79ce0a89f77386978692b9b18 guix-build-797b3ed90900/output/x86_64-linux-gnu/bitcoin-797b3ed90900-x86_64-linux-gnu.tar.gz 94c11c328a628052eb6f50e9816aa768f87ea7acfbbbafdab60f6928da766811 guix-build-797b3ed90900/output/x86_64-w64-mingw32/SHA256SUMS.part fd371922ba93d81bd4a2b711d617af6756f9f0494db6d83aa0e5f491a24168ef guix-build-797b3ed90900/output/x86_64-w64-mingw32/bitcoin-797b3ed90900-win-unsigned.tar.gz 4e4ad976bc029bbbf9596ad8493accaaba8b0d5c598dd342f8da330609bbdf21 guix-build-797b3ed90900/output/x86_64-w64-mingw32/bitcoin-797b3ed90900-win64-debug.zip 3a89a16b9101e9a17d98efb9234b5bdd264c0bba2c6326511017730e1a08311f guix-build-797b3ed90900/output/x86_64-w64-mingw32/bitcoin-797b3ed90900-win64-setup-unsigned.exe e285ab737e3c843fd3f1c26c2f053e421a3c39b33995747ce48281884d3f28d1 guix-build-797b3ed90900/output/x86_64-w64-mingw32/bitcoin-797b3ed90900-win64.zip ``` ACKs for top commit: sipa: utACK 797b3ed9090030f32fade81803b580562d4a90a3 hebasto: ACK 797b3ed9090030f32fade81803b580562d4a90a3 Tree-SHA512: 3a569702d8832c155c5ce8d2f6d823f7f12603885576078bc5192bc9038a48261ecb541800f79d1e9bc86d71fa640265c5b8b89df9d8bb680b3bb05d9d78a666
101 lines
3.2 KiB
Diff
101 lines
3.2 KiB
Diff
https://sourceware.org/git/?p=glibc.git;a=commit;h=fc3e1337be1c6935ab58bd13520f97a535cf70cc
|
|
|
|
commit dc23a45db566095e83ff0b7a57afc87fb5ca89a1
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Wed Sep 21 10:45:32 2016 +0200
|
|
|
|
Avoid running $(CXX) during build to obtain header file paths
|
|
|
|
This reduces the build time somewhat and is particularly noticeable
|
|
during rebuilds with few code changes.
|
|
|
|
diff --git a/Makerules b/Makerules
|
|
index 7e4077ee50..c338850de5 100644
|
|
--- a/Makerules
|
|
+++ b/Makerules
|
|
@@ -121,14 +121,10 @@ ifneq (,$(CXX))
|
|
# will be used instead of /usr/include/stdlib.h and /usr/include/math.h.
|
|
before-compile := $(common-objpfx)cstdlib $(common-objpfx)cmath \
|
|
$(before-compile)
|
|
-cstdlib=$(shell echo "\#include <cstdlib>" | $(CXX) -M -MP -x c++ - \
|
|
- | sed -n "/cstdlib:/{s/:$$//;p}")
|
|
-$(common-objpfx)cstdlib: $(cstdlib)
|
|
+$(common-objpfx)cstdlib: $(c++-cstdlib-header)
|
|
$(INSTALL_DATA) $< $@T
|
|
$(move-if-change) $@T $@
|
|
-cmath=$(shell echo "\#include <cmath>" | $(CXX) -M -MP -x c++ - \
|
|
- | sed -n "/cmath:/{s/:$$//;p}")
|
|
-$(common-objpfx)cmath: $(cmath)
|
|
+$(common-objpfx)cmath: $(c++-cmath-header)
|
|
$(INSTALL_DATA) $< $@T
|
|
$(move-if-change) $@T $@
|
|
endif
|
|
diff --git a/config.make.in b/config.make.in
|
|
index 95c6f36876..04a8b3ed7f 100644
|
|
--- a/config.make.in
|
|
+++ b/config.make.in
|
|
@@ -45,6 +45,8 @@ defines = @DEFINES@
|
|
sysheaders = @sysheaders@
|
|
sysincludes = @SYSINCLUDES@
|
|
c++-sysincludes = @CXX_SYSINCLUDES@
|
|
+c++-cstdlib-header = @CXX_CSTDLIB_HEADER@
|
|
+c++-cmath-header = @CXX_CMATH_HEADER@
|
|
all-warnings = @all_warnings@
|
|
enable-werror = @enable_werror@
|
|
|
|
diff --git a/configure b/configure
|
|
index 17625e1041..6ff252744b 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -635,6 +635,8 @@ BISON
|
|
INSTALL_INFO
|
|
PERL
|
|
BASH_SHELL
|
|
+CXX_CMATH_HEADER
|
|
+CXX_CSTDLIB_HEADER
|
|
CXX_SYSINCLUDES
|
|
SYSINCLUDES
|
|
AUTOCONF
|
|
@@ -5054,6 +5056,18 @@ fi
|
|
|
|
|
|
|
|
+# Obtain some C++ header file paths. This is used to make a local
|
|
+# copy of those headers in Makerules.
|
|
+if test -n "$CXX"; then
|
|
+ find_cxx_header () {
|
|
+ echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}"
|
|
+ }
|
|
+ CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
|
|
+ CXX_CMATH_HEADER="$(find_cxx_header cmath)"
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
# Test if LD_LIBRARY_PATH contains the notation for the current directory
|
|
# since this would lead to problems installing/building glibc.
|
|
# LD_LIBRARY_PATH contains the current directory if one of the following
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 33bcd62180..9938ab0dc2 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1039,6 +1039,18 @@ fi
|
|
AC_SUBST(SYSINCLUDES)
|
|
AC_SUBST(CXX_SYSINCLUDES)
|
|
|
|
+# Obtain some C++ header file paths. This is used to make a local
|
|
+# copy of those headers in Makerules.
|
|
+if test -n "$CXX"; then
|
|
+ find_cxx_header () {
|
|
+ echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}"
|
|
+ }
|
|
+ CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
|
|
+ CXX_CMATH_HEADER="$(find_cxx_header cmath)"
|
|
+fi
|
|
+AC_SUBST(CXX_CSTDLIB_HEADER)
|
|
+AC_SUBST(CXX_CMATH_HEADER)
|
|
+
|
|
# Test if LD_LIBRARY_PATH contains the notation for the current directory
|
|
# since this would lead to problems installing/building glibc.
|
|
# LD_LIBRARY_PATH contains the current directory if one of the following
|