diff options
| author | W. J. van der Laan <laanwj@protonmail.com> | 2021-12-15 21:54:10 +0100 |
|---|---|---|
| committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-12-15 21:56:01 +0100 |
| commit | fee16b15fa3425871670239c25d4e61ae961e0c5 (patch) | |
| tree | 90baff7e2f01ff38778096a1cd03278f619db5f1 | |
| parent | 216f4ca9e7ccb1f0fcb9bab0f9940992a87ae55f (diff) | |
| parent | 66a20a54a2a8446e6257b872a161089e0eed1688 (diff) | |
| download | bitcoin-fee16b15fa3425871670239c25d4e61ae961e0c5.tar.xz | |
Merge bitcoin/bitcoin#23744: build, qt: Drop support for i686-linux-android host
66a20a54a2a8446e6257b872a161089e0eed1688 build, qt: Drop support for `i686-linux-android` host (Hennadii Stepanov)
Pull request description:
There are no reasons to keep support for `i686-linux-android` host, which is actually broken in master (50c502f54abd9eb15c8ddca013f0fdfae3d132a9), and this fact has been unnoticed for months :)
https://github.com/bitcoin/bitcoin/pull/23675#issuecomment-986206434:
> I'm surprised `i686-linux-android` ABI is still supported. I would love to drop it...
https://github.com/bitcoin/bitcoin/pull/23675#issuecomment-991340132
> What is `i686-linux-android`? 32-bit x86 android? is that really a thing?
ACKs for top commit:
prusnak:
utACK 66a20a54a2a8446e6257b872a161089e0eed1688
Tree-SHA512: 211f794de2fc569f0ade2a4da805b8bfd4ce2ab0930c5d427acc4f5d015fcdc4911f02fc64f6401197f7641aed79944a9594be80c817547be3269cdd721cf79b
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | depends/README.md | 1 | ||||
| -rw-r--r-- | depends/packages/qt.mk | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index da71ee93c5..559994818e 100644 --- a/configure.ac +++ b/configure.ac @@ -776,10 +776,7 @@ case $host in *armv7a*) ANDROID_ARCH=armeabi-v7a ;; - *i686*) - ANDROID_ARCH=i686 - ;; - *) AC_MSG_ERROR([Could not determine Android arch]) ;; + *) AC_MSG_ERROR([Could not determine Android arch, or it is unsupported]) ;; esac ;; *linux*) diff --git a/depends/README.md b/depends/README.md index d7fba754c4..2a39ed3907 100644 --- a/depends/README.md +++ b/depends/README.md @@ -38,7 +38,6 @@ Common `host-platform-triplet`s for cross compilation are: - `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 - `x86_64-linux-android` for Android x86 64 bit The paths are automatically configured and no other options are needed unless targeting [Android](../doc/build-android.md). diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 6b2d44dc64..83479b4b06 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -181,7 +181,6 @@ $(package)_config_opts_android += -no-feature-vulkan $(package)_config_opts_aarch64_android += -android-arch arm64-v8a $(package)_config_opts_armv7a_android += -android-arch armeabi-v7a $(package)_config_opts_x86_64_android += -android-arch x86_64 -$(package)_config_opts_i686_android += -android-arch i686 endef define $(package)_fetch_cmds |