zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #4749 - str4d:update-config-guess-and-sub, r=str4d 

depends: Update to latest config.guess & config.sub
This commit is contained in:
Homu 2020-09-29 02:17:39 +00:00
parent 94cf4a4946 f43e3833f3
commit 9245388bbc
6 changed files with 2119 additions and 1836 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile.am
View File

@ -51,10 +51,10 @@ baseline.info:
baseline_filtered.info: baseline.info
$(LCOV) -r $< "/usr/include/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
"$(abs_builddir)/src/gtest/*" \
"$(abs_builddir)/src/test/*" \
"$(abs_builddir)/src/wallet/gtest/*" \
@ -66,10 +66,10 @@ leveldb_baseline.info: baseline_filtered.info
leveldb_baseline_filtered.info: leveldb_baseline.info
$(LCOV) -r $< "/usr/include/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
"$(abs_builddir)/src/gtest/*" \
"$(abs_builddir)/src/test/*" \
"$(abs_builddir)/src/wallet/gtest/*" \
@ -87,10 +87,10 @@ test_bitcoin.info: baseline_filtered_combined.info
test_bitcoin_filtered.info: test_bitcoin.info
$(LCOV) -r $< "/usr/include/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
"$(abs_builddir)/src/gtest/*" \
"$(abs_builddir)/src/test/*" \
"$(abs_builddir)/src/wallet/gtest/*" \
@ -105,10 +105,10 @@ zcash-gtest.info: baseline_filtered_combined.info
zcash-gtest_filtered.info: zcash-gtest.info
$(LCOV) -r $< "/usr/include/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
"$(abs_builddir)/src/gtest/*" \
"$(abs_builddir)/src/test/*" \
"$(abs_builddir)/src/wallet/gtest/*" \

2
contrib/gitian-descriptors/gitian-linux.yml
View File

@ -31,7 +31,7 @@ remotes:
files: []
script: |
WRAP_DIR=$HOME/wrapped
HOSTS="x86_64-unknown-linux-gnu"
HOSTS="x86_64-linux-gnu"
CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --enable-hardening"
MAKEOPTS="V=1"
FAKETIME_HOST_PROGS=""

993
depends/config.guess vendored
View File

File diff suppressed because it is too large Load Diff

2923
depends/config.sub vendored
View File

File diff suppressed because it is too large Load Diff

1
depends/packages/native_rust.mk
View File

@ -11,6 +11,7 @@ $(package)_sha256_hash_freebsd=36a14498f9d1d7fb50d6fc01740960a99aff3d4c4c3d2e4ff
# Mapping from GCC canonical hosts to Rust targets
# If a mapping is not present, we assume they are identical, unless $host_os is
# "darwin", in which case we assume x86_64-apple-darwin.
$(package)_rust_target_x86_64-pc-linux-gnu=x86_64-unknown-linux-gnu
$(package)_rust_target_x86_64-w64-mingw32=x86_64-pc-windows-gnu
# Mapping from Rust targets to SHA-256 hashes

4
qa/zcash/full_test_suite.py
View File

@ -88,7 +88,7 @@ def check_security_hardening():
def ensure_no_dot_so_in_depends():
depends_dir = os.path.join(REPOROOT, 'depends')
arch_dir = os.path.join(depends_dir, 'x86_64-unknown-linux-gnu')
arch_dir = os.path.join(depends_dir, 'x86_64-pc-linux-gnu')
if not os.path.isdir(arch_dir):
# Not Linux, try MacOS
arch_dirs = glob(os.path.join(depends_dir, 'x86_64-apple-darwin*'))
@ -127,7 +127,7 @@ def util_test():
) == 0
def rust_test():
depends_dir = os.path.join(REPOROOT, 'depends', 'x86_64-unknown-linux-gnu')
depends_dir = os.path.join(REPOROOT, 'depends', 'x86_64-pc-linux-gnu')
if not os.path.isdir(depends_dir):
depends_dir = os.path.join(REPOROOT, 'depends', 'x86_64-apple-darwin')