D7229.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D7229.diff
View Options

	diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
	--- a/contrib/gitian-descriptors/gitian-linux.yml
	+++ b/contrib/gitian-descriptors/gitian-linux.yml
	@@ -6,8 +6,6 @@
	- "buster"
	architectures:
	- "amd64"
	-multiarch:
	-- "i386"
	packages:
	- "autoconf"
	- "automake"
	@@ -25,8 +23,6 @@
	- "gcc-arm-linux-gnueabihf"
	- "git"
	- "gperf"
	-- "lib32stdc++-8-dev"
	-- "libc6-dev:i386"
	- "libtool"
	- "ninja-build"
	- "pkg-config"
	@@ -49,11 +45,10 @@
	script: \|

	WRAP_DIR=$HOME/wrapped
	- HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"
	+ HOSTS="x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"

	# CMake toolchain file name differ from host name
	declare -A CMAKE_TOOLCHAIN_FILE
	- CMAKE_TOOLCHAIN_FILE[i686-pc-linux-gnu]=Linux32.cmake
	CMAKE_TOOLCHAIN_FILE[x86_64-linux-gnu]=Linux64.cmake
	CMAKE_TOOLCHAIN_FILE[arm-linux-gnueabihf]=LinuxARM.cmake
	CMAKE_TOOLCHAIN_FILE[aarch64-linux-gnu]=LinuxAArch64.cmake
	diff --git a/contrib/release/github-release.sh b/contrib/release/github-release.sh
	--- a/contrib/release/github-release.sh
	+++ b/contrib/release/github-release.sh
	@@ -112,7 +112,6 @@
	# Linux binaries
	ASSET_LIST+=("${ASSET_DIR}/linux/bitcoin-abc-${VERSION}-aarch64-linux-gnu.tar.gz")
	ASSET_LIST+=("${ASSET_DIR}/linux/bitcoin-abc-${VERSION}-arm-linux-gnueabihf.tar.gz")
	- ASSET_LIST+=("${ASSET_DIR}/linux/bitcoin-abc-${VERSION}-i686-pc-linux-gnu.tar.gz")
	ASSET_LIST+=("${ASSET_DIR}/linux/bitcoin-abc-${VERSION}-x86_64-linux-gnu.tar.gz")

	# OSX binaries