Browse Source

Auto merge of #1577 - radix42:v1.0.0-rc1-gitian, r=daira

V1.0.0 rc1 gitian

Removes indeterminism from gitian builds: underlying processor instruction set variant of x86_64 was being detected by the libgmp autoconf process, which caused differences in libgmp and libsnark
metaverse
zkbot 8 years ago
parent
commit
90031e1d61
  1. 2
      depends/Makefile
  2. 2
      depends/packages/libgmp.mk
  3. 4
      zcutil/build.sh

2
depends/Makefile

@ -8,7 +8,7 @@ NO_WALLET ?=
NO_UPNP ?=
FALLBACK_DOWNLOAD_PATH ?= https://z.cash/depends-sources
BUILD = $(shell ./config.guess)
BUILD ?= $(shell ./config.guess)
HOST ?= $(BUILD)
PATCHES_PATH = $(BASEDIR)/patches
BASEDIR = $(CURDIR)

2
depends/packages/libgmp.mk

@ -7,7 +7,7 @@ $(package)_dependencies=
$(package)_config_opts=--enable-cxx --disable-shared
define $(package)_config_cmds
$($(package)_autoconf)
$($(package)_autoconf) --host=$(host) --build=$(build)
endef
define $(package)_build_cmds

4
zcutil/build.sh

@ -35,7 +35,7 @@ fi
# BUG: parameterize the platform/host directory:
PREFIX="$(pwd)/depends/x86_64-unknown-linux-gnu/"
make "$@" -C ./depends/ V=1 NO_QT=1
HOST=x86_64-unknown-linux-gnu BUILD=x86_64-unknown-linux-gnu make "$@" -C ./depends/ V=1 NO_QT=1
./autogen.sh
./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g'
./configure --prefix="${PREFIX}" --host=x86_64-unknown-linux-gnu --build=x86_64-unknown-linux-gnu --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g'
make "$@" V=1

Loading…
Cancel
Save