Skip to content

Commit

Permalink
depends: Support for S390X targets
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcoFalke committed Dec 5, 2019
1 parent 989fd53 commit 1111324
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions depends/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ aarch64*
powerpc*
riscv32*
riscv64*
s390x*
2 changes: 1 addition & 1 deletion depends/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ $(host_prefix)/share/config.site: check-packages
check-packages: check-sources

clean-all: clean
@rm -rf $(SOURCES_PATH) x86_64* i686* mips* arm* aarch64* powerpc* riscv32* riscv64*
@rm -rf $(SOURCES_PATH) x86_64* i686* mips* arm* aarch64* powerpc* riscv32* riscv64* s390x*

clean:
@rm -rf $(WORK_PATH) $(BASE_CACHE) $(BUILD)
Expand Down
9 changes: 7 additions & 2 deletions depends/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ For example:

make HOST=x86_64-w64-mingw32 -j4

**Bitcoin's configure script by default will ignore the depends output.** In
**Bitcoin Core's configure script by default will ignore the depends output.** In
order for it to pick up libraries, tools, and settings from the depends build,
you must point it at the appropriate `--prefix` directory generated by the
build. In the above example, a prefix dir named x86_64-w64-mingw32 will be
created. To use it for Bitcoin:

./configure --prefix=`pwd`/depends/x86_64-w64-mingw32
./configure --prefix=$PWD/depends/x86_64-w64-mingw32

Common `host-platform-triplets` for cross compilation are:

Expand All @@ -32,6 +32,7 @@ Common `host-platform-triplets` for cross compilation are:
- `powerpc64le-linux-gnu` for Linux POWER 64-bit (little endian)
- `riscv32-linux-gnu` for Linux RISC-V 32 bit
- `riscv64-linux-gnu` for Linux RISC-V 64 bit
- `s390x-linux-gnu` for Linux S390X
- `armv7a-linux-android` for Android ARM 32 bit
- `aarch64-linux-android` for Android ARM 64 bit
- `i686-linux-android` for Android x86 32 bit
Expand Down Expand Up @@ -74,6 +75,10 @@ For linux RISC-V 64-bit cross compilation (there are no packages for 32-bit):
RISC-V known issue: gcc-7.3.0 and gcc-7.3.1 result in a broken `test_bitcoin` executable (see https://github.com/bitcoin/bitcoin/pull/13543),
this is apparently fixed in gcc-8.1.0.

For linux S390X cross compilation:

sudo apt-get install g++-s390x-linux-gnu binutils-s390x-linux-gnu

### Dependency Options
The following can be set when running make: make FOO=bar

Expand Down
1 change: 1 addition & 0 deletions depends/packages/qt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ $(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++
$(package)_config_opts_powerpc64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
$(package)_config_opts_powerpc64le_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
$(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
$(package)_config_opts_s390x_linux = -platform linux-g++ -xplatform bitcoin-linux-g++

$(package)_config_opts_mingw32 = -no-opengl
$(package)_config_opts_mingw32 += -no-dbus
Expand Down

0 comments on commit 1111324

Please sign in to comment.