From 850019de423b4e4bc70474bd17722f34a7e6b2fa Mon Sep 17 00:00:00 2001 From: David Mercer Date: Wed, 19 Oct 2016 15:48:52 -0700 Subject: [PATCH 1/4] explicitly pass HOST and BUILD to ./configure --- zcutil/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zcutil/build.sh b/zcutil/build.sh index e259c02cb..968b34889 100755 --- a/zcutil/build.sh +++ b/zcutil/build.sh @@ -37,5 +37,5 @@ PREFIX="$(pwd)/depends/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 From 1ead1bb0b3567f4ced2e29ed7fc09fafce94f48f Mon Sep 17 00:00:00 2001 From: David Mercer Date: Wed, 19 Oct 2016 19:36:52 -0700 Subject: [PATCH 2/4] allow both HOST and BUILD to be passed in from the zcutil/build.sh --- depends/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/Makefile b/depends/Makefile index 2b2538f95..3d8dd25ca 100644 --- a/depends/Makefile +++ b/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) From 33118f63b940c91be64617cee3fef88c58c6d0aa Mon Sep 17 00:00:00 2001 From: David Mercer Date: Wed, 19 Oct 2016 19:37:37 -0700 Subject: [PATCH 3/4] pass in both HOST and BUILD to depends system, needed for deterministic builds --- zcutil/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zcutil/build.sh b/zcutil/build.sh index 968b34889..0000c6201 100755 --- a/zcutil/build.sh +++ b/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}" --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 From ed928f413ed3d2a15f49c22f7c6962d45651d3c6 Mon Sep 17 00:00:00 2001 From: David Mercer Date: Wed, 19 Oct 2016 20:18:03 -0700 Subject: [PATCH 4/4] explicitly pass HOST and BUILD to libgmp ./configure --- depends/packages/libgmp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/libgmp.mk b/depends/packages/libgmp.mk index cf3dfc0f7..2e55b05f6 100644 --- a/depends/packages/libgmp.mk +++ b/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