Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-11-17 01:37:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

depends: base build_id on guix environment

Browse source
This commit is contained in:
tobtoht 2023-10-13 18:19:33 +02:00
parent d405537c3e
commit c97a874e82
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
3 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/depends/Makefile
View file

@ -150,8 +150,8 @@ include packages/packages.mk
# 2. Before including packages/*.mk (excluding packages/packages.mk), since # 2. Before including packages/*.mk (excluding packages/packages.mk), since
# they rely on the build_id variables # they rely on the build_id variables
# #
build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(build_AR)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))') build_id:=$(shell env SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(host_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(host_AR)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))') $(host_arch)_$(host_os)_id:=$(shell env SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
ifneq ($(OUTDIR),) ifneq ($(OUTDIR),)
$(file >> $(OUTDIR)/build-hashes.txt,$(host_arch)_$(host_os)_id=$($(host_arch)_$(host_os)_id)) $(file >> $(OUTDIR)/build-hashes.txt,$(host_arch)_$(host_os)_id=$($(host_arch)_$(host_os)_id))
endif endif

37
contrib/depends/gen_id
View file

@ -34,37 +34,14 @@
echo "$@" echo "$@"
echo "END ID SALT" echo "END ID SALT"
# GCC only prints COLLECT_LTO_WRAPPER when invoked with just "-v", but we want echo "BEGIN /gnu/store"
# the information from "-v -E -" as well, so just include both. bash -c "ls -1 /gnu/store | sort"
echo "BEGIN CC" echo "END /gnu/store"
bash -c "${CC} -v"
bash -c "${CC} -v -E -xc -o /dev/null - < /dev/null"
bash -c "${CC} -v -E -xobjective-c -o /dev/null - < /dev/null"
echo "C_STANDARD=${C_STANDARD}"
echo "END CC"
echo "BEGIN CXX" # LINES=\|COLUMNS=\|\|HOSTTYPE=\|OSTYPE=\|MACHTYPE=\|HOSTNAME=
bash -c "${CXX} -v" echo "BEGIN environment"
bash -c "${CXX} -v -E -xc++ -o /dev/null - < /dev/null" bash -c "printenv | sort | grep -v '^\(BASE_CACHE=\|DISTNAME=\|DISTSRC=\|OUTDIR=\|SOURCES_PATH=\|JOBS=\)'"
bash -c "${CXX} -v -E -xobjective-c++ -o /dev/null - < /dev/null" echo "END environment"
echo "CXX_STANDARD=${CXX_STANDARD}"
echo "END CXX"
echo "BEGIN AR"
bash -c "${AR} --version"
env | grep '^AR_'
echo "ZERO_AR_DATE=${ZERO_AR_DATE}"
echo "END AR"
echo "BEGIN RANLIB"
bash -c "${RANLIB} --version"
env | grep '^RANLIB_'
echo "END RANLIB"
echo "BEGIN STRIP"
bash -c "${STRIP} --version"
env | grep '^STRIP_'
echo "END STRIP"
echo "END ALL" echo "END ALL"
) | if [ -n "$DEBUG_GENID" ] && command -v tee > /dev/null 2>&1; then ) | if [ -n "$DEBUG_GENID" ] && command -v tee > /dev/null 2>&1; then

1
contrib/guix/libexec/build.sh
View file

@ -7,6 +7,7 @@ export LC_ALL=C
set -e -o pipefail set -e -o pipefail
export TZ=UTC export TZ=UTC
export DEBUG_GENID=1 export DEBUG_GENID=1
export HOSTNAME=host
# shellcheck source=contrib/shell/git-utils.bash # shellcheck source=contrib/shell/git-utils.bash
source contrib/shell/git-utils.bash source contrib/shell/git-utils.bash