From 0b0cff3c61610fb56f8c5c9451ace01598117a8d Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Tue, 28 May 2019 03:12:59 +0200 Subject: Add support for building Android dependencies --- depends/packages/openssl.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'depends/packages') diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index db47113b2f..6a316a308e 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -57,6 +57,7 @@ $(package)_config_opts_riscv64_linux=linux-generic64 $(package)_config_opts_x86_64_darwin=darwin64-x86_64-cc $(package)_config_opts_x86_64_mingw32=mingw64 $(package)_config_opts_i686_mingw32=mingw +$(package)_config_opts_android=linux-generic64 endef define $(package)_preprocess_cmds -- cgit v1.2.3 From b68f2a68c211aa2264e9ca824d10a90f4a5a5af4 Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Mon, 16 Sep 2019 13:34:14 +0200 Subject: Add config opts and patch for aarch64_android build of Qt --- depends/packages/packages.mk | 1 + depends/packages/qt.mk | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'depends/packages') diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 667fde5271..61b4b53ab3 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -6,6 +6,7 @@ protobuf_packages = protobuf qt_packages = qrencode zlib qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig +qt_android_packages=qt rapidcheck_packages = rapidcheck diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 56045ade50..ff80eb2648 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -8,7 +8,7 @@ $(package)_dependencies=openssl zlib $(package)_linux_dependencies=freetype fontconfig libxcb $(package)_build_subdir=qtbase $(package)_qt_libs=corelib network widgets gui plugins testlib -$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch +$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch fix_android_qmake_conf.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=fb5a47799754af73d3bf501fe513342cfe2fc37f64e80df5533f6110e804220c @@ -19,6 +19,8 @@ $(package)_qttools_sha256_hash=a97556eb7b2f30252cdd8a598c396cfce2b2f79d2bae883af $(package)_extra_sources = $($(package)_qttranslations_file_name) $(package)_extra_sources += $($(package)_qttools_file_name) +$(package)_config_opts_aarch64_android = -xplatform android-clang -android-sdk $(ANDROID_SDK) -android-ndk $(ANDROID_NDK) -android-ndk-platform android-$(ANDROID_API_LEVEL) -device-option CROSS_COMPILE="$(host)-" -egl -qpa xcb -no-eglfs -opengl es2 -qt-freetype -no-fontconfig -L $(host_prefix)/lib -I $(host_prefix)/include + define $(package)_set_vars $(package)_config_opts_release = -release $(package)_config_opts_debug = -debug @@ -127,6 +129,19 @@ $(package)_config_opts_x86_64_linux = -xplatform linux-g++-64 $(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++ $(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++ $(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-" +$(package)_config_opts_aarch64_android = -xplatform android-clang +$(package)_config_opts_aarch64_android += -android-sdk $(ANDROID_SDK) +$(package)_config_opts_aarch64_android += -android-ndk $(ANDROID_NDK) +$(package)_config_opts_aarch64_android += -android-ndk-platform android-$(ANDROID_API_LEVEL) +$(package)_config_opts_aarch64_android += -device-option CROSS_COMPILE="$(host)-" +$(package)_config_opts_aarch64_android += -egl +$(package)_config_opts_aarch64_android += -qpa xcb +$(package)_config_opts_aarch64_android += -no-eglfs +$(package)_config_opts_aarch64_android += -opengl es2 +$(package)_config_opts_aarch64_android += -qt-freetype +$(package)_config_opts_aarch64_android += -no-fontconfig +$(package)_config_opts_aarch64_android += -L $(host_prefix)/lib +$(package)_config_opts_aarch64_android += -I $(host_prefix)/include $(package)_build_env = QT_RCC_TEST=1 $(package)_build_env += QT_RCC_SOURCE_DATE_OVERRIDE=1 endef @@ -169,6 +184,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_rcc_determinism.patch &&\ patch -p1 -i $($(package)_patch_dir)/xkb-default.patch &&\ + patch -p1 -i $($(package)_patch_dir)/fix_android_qmake_conf.patch &&\ echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ -- cgit v1.2.3 From 80b475f159525737e242161397f35d0729449545 Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Thu, 19 Sep 2019 11:43:10 +0200 Subject: Fix Android zlib cross compilation issue (https://stackoverflow.com/questions/21396988/zlib-build-not-configuring-properly-with-cross-compiler-ignores-ar) --- depends/packages/zlib.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'depends/packages') diff --git a/depends/packages/zlib.mk b/depends/packages/zlib.mk index 168f85e65e..017e7b2cf1 100644 --- a/depends/packages/zlib.mk +++ b/depends/packages/zlib.mk @@ -11,6 +11,7 @@ $(package)_config_opts+=RANLIB="$($(package)_ranlib)" $(package)_config_opts+=AR="$($(package)_ar)" $(package)_config_opts_darwin+=AR="$($(package)_libtool)" $(package)_config_opts_darwin+=ARFLAGS="-o" +$(package)_config_opts_aarch64_android+=CHOST=$(host) endef # zlib has its own custom configure script that takes in options like CC, -- cgit v1.2.3 From 24ffef0c271739a2ca75feecb816f3218c1850bf Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Sun, 22 Sep 2019 15:40:15 +0200 Subject: Patch libevent when building for Android (fix arc4random_addrandom) --- depends/packages/libevent.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'depends/packages') diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk index a3ade899b7..df6029828d 100644 --- a/depends/packages/libevent.mk +++ b/depends/packages/libevent.mk @@ -3,10 +3,17 @@ $(package)_version=2.1.8-stable $(package)_download_path=https://github.com/libevent/libevent/archive/ $(package)_file_name=release-$($(package)_version).tar.gz $(package)_sha256_hash=316ddb401745ac5d222d7c529ef1eada12f58f6376a66c1118eee803cb70f83d +$(package)_patches=fix_android_arc4random_addrandom.patch -define $(package)_preprocess_cmds - ./autogen.sh -endef +ifneq (,$(findstring android,$(host))) + define $(package)_preprocess_cmds + ./autogen.sh && patch -p1 < $($(package)_patch_dir)/fix_android_arc4random_addrandom.patch + endef +else + define $(package)_preprocess_cmds + ./autogen.sh + endef +endif define $(package)_set_vars $(package)_config_opts=--disable-shared --disable-openssl --disable-libevent-regress --disable-samples -- cgit v1.2.3 From e4c319e8a1c6e40a953036b942bd5d732b0bbf69 Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Mon, 23 Sep 2019 14:44:49 +0200 Subject: builds: remove superfluous config_opts_aarch64_android --- depends/packages/qt.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'depends/packages') diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index ff80eb2648..a0cf930a71 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -19,8 +19,6 @@ $(package)_qttools_sha256_hash=a97556eb7b2f30252cdd8a598c396cfce2b2f79d2bae883af $(package)_extra_sources = $($(package)_qttranslations_file_name) $(package)_extra_sources += $($(package)_qttools_file_name) -$(package)_config_opts_aarch64_android = -xplatform android-clang -android-sdk $(ANDROID_SDK) -android-ndk $(ANDROID_NDK) -android-ndk-platform android-$(ANDROID_API_LEVEL) -device-option CROSS_COMPILE="$(host)-" -egl -qpa xcb -no-eglfs -opengl es2 -qt-freetype -no-fontconfig -L $(host_prefix)/lib -I $(host_prefix)/include - define $(package)_set_vars $(package)_config_opts_release = -release $(package)_config_opts_debug = -debug @@ -134,6 +132,7 @@ $(package)_config_opts_aarch64_android += -android-sdk $(ANDROID_SDK) $(package)_config_opts_aarch64_android += -android-ndk $(ANDROID_NDK) $(package)_config_opts_aarch64_android += -android-ndk-platform android-$(ANDROID_API_LEVEL) $(package)_config_opts_aarch64_android += -device-option CROSS_COMPILE="$(host)-" +$(package)_config_opts_aarch64_android += -android-arch arm64-v8a $(package)_config_opts_aarch64_android += -egl $(package)_config_opts_aarch64_android += -qpa xcb $(package)_config_opts_aarch64_android += -no-eglfs -- cgit v1.2.3 From ed30684d03d3a1d5496e69c488d848fe92ae6fb4 Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Sat, 12 Oct 2019 12:49:25 +0200 Subject: Qt: patch androidjnimain.cpp to make sure JNI is initialised when statically compiled --- depends/packages/qt.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'depends/packages') diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index a0cf930a71..2f10a587c4 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -8,7 +8,7 @@ $(package)_dependencies=openssl zlib $(package)_linux_dependencies=freetype fontconfig libxcb $(package)_build_subdir=qtbase $(package)_qt_libs=corelib network widgets gui plugins testlib -$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch fix_android_qmake_conf.patch +$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch fix_android_qmake_conf.patch fix_android_jni_static.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=fb5a47799754af73d3bf501fe513342cfe2fc37f64e80df5533f6110e804220c @@ -184,6 +184,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fix_rcc_determinism.patch &&\ patch -p1 -i $($(package)_patch_dir)/xkb-default.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_android_qmake_conf.patch &&\ + patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch &&\ echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ -- cgit v1.2.3 From f9af3ced1c69d65c5c530ec5526f5eefaf786126 Mon Sep 17 00:00:00 2001 From: Block Mechanic Date: Fri, 18 Oct 2019 22:03:51 +0200 Subject: Android: add all arch support Add support for armv7a, i686 and x86_64 archs to android.mk Add -fPIC to depends file as anddroid requires it see https://stackoverflow.com/questions/30498776/position-independent-executables-and-android --- depends/packages/boost.mk | 5 +++++ depends/packages/libevent.mk | 1 + depends/packages/openssl.mk | 6 +++++- depends/packages/qrencode.mk | 1 + depends/packages/qt.mk | 32 +++++++++++++++++++------------- depends/packages/zeromq.mk | 1 + depends/packages/zlib.mk | 2 +- 7 files changed, 33 insertions(+), 15 deletions(-) (limited to 'depends/packages') diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 5df49b2af8..5dfa1d2cdf 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -15,6 +15,10 @@ $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win3 $(package)_config_opts_x86_64_mingw32=address-model=64 $(package)_config_opts_i686_mingw32=address-model=32 $(package)_config_opts_i686_linux=address-model=32 architecture=x86 +$(package)_config_opts_i686_android=address-model=32 +$(package)_config_opts_aarch64_android=address-model=64 +$(package)_config_opts_x86_64_android=address-model=64 +$(package)_config_opts_armv7a_android=address-model=32 $(package)_toolset_$(host_os)=gcc $(package)_archiver_$(host_os)=$($(package)_ar) $(package)_toolset_darwin=darwin @@ -22,6 +26,7 @@ $(package)_archiver_darwin=$($(package)_libtool) $(package)_config_libraries=chrono,filesystem,system,thread,test $(package)_cxxflags=-std=c++11 -fvisibility=hidden $(package)_cxxflags_linux=-fPIC +$(package)_cxxflags_android=-fPIC endef define $(package)_preprocess_cmds diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk index df6029828d..bf5de61029 100644 --- a/depends/packages/libevent.mk +++ b/depends/packages/libevent.mk @@ -19,6 +19,7 @@ define $(package)_set_vars $(package)_config_opts=--disable-shared --disable-openssl --disable-libevent-regress --disable-samples $(package)_config_opts_release=--disable-debug-mode $(package)_config_opts_linux=--with-pic + $(package)_config_opts_android=--with-pic endef define $(package)_config_cmds diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index 6a316a308e..ad922778ac 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -57,7 +57,11 @@ $(package)_config_opts_riscv64_linux=linux-generic64 $(package)_config_opts_x86_64_darwin=darwin64-x86_64-cc $(package)_config_opts_x86_64_mingw32=mingw64 $(package)_config_opts_i686_mingw32=mingw -$(package)_config_opts_android=linux-generic64 +$(package)_config_opts_android=-fPIC +$(package)_config_opts_aarch64_android=linux-generic64 +$(package)_config_opts_x86_64_android=linux-generic64 +$(package)_config_opts_armv7a_android=linux-generic32 +$(package)_config_opts_i686_android=linux-generic32 endef define $(package)_preprocess_cmds diff --git a/depends/packages/qrencode.mk b/depends/packages/qrencode.mk index 3bc2cb768c..eed2bcd980 100644 --- a/depends/packages/qrencode.mk +++ b/depends/packages/qrencode.mk @@ -8,6 +8,7 @@ define $(package)_set_vars $(package)_config_opts=--disable-shared --without-tools --without-tests --disable-sdltest $(package)_config_opts += --disable-gprof --disable-gcov --disable-mudflap $(package)_config_opts_linux=--with-pic +$(package)_config_opts_android=--with-pic endef define $(package)_preprocess_cmds diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 2f10a587c4..d4c4ab0ae8 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -127,20 +127,26 @@ $(package)_config_opts_x86_64_linux = -xplatform linux-g++-64 $(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++ $(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++ $(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-" -$(package)_config_opts_aarch64_android = -xplatform android-clang -$(package)_config_opts_aarch64_android += -android-sdk $(ANDROID_SDK) -$(package)_config_opts_aarch64_android += -android-ndk $(ANDROID_NDK) -$(package)_config_opts_aarch64_android += -android-ndk-platform android-$(ANDROID_API_LEVEL) -$(package)_config_opts_aarch64_android += -device-option CROSS_COMPILE="$(host)-" + +$(package)_config_opts_android = -xplatform android-clang +$(package)_config_opts_android += -android-sdk $(ANDROID_SDK) +$(package)_config_opts_android += -android-ndk $(ANDROID_NDK) +$(package)_config_opts_android += -android-ndk-platform android-$(ANDROID_API_LEVEL) +$(package)_config_opts_android += -device-option CROSS_COMPILE="$(host)-" +$(package)_config_opts_android += -egl +$(package)_config_opts_android += -qpa xcb +$(package)_config_opts_android += -no-eglfs +$(package)_config_opts_android += -opengl es2 +$(package)_config_opts_android += -qt-freetype +$(package)_config_opts_android += -no-fontconfig +$(package)_config_opts_android += -L $(host_prefix)/lib +$(package)_config_opts_android += -I $(host_prefix)/include + $(package)_config_opts_aarch64_android += -android-arch arm64-v8a -$(package)_config_opts_aarch64_android += -egl -$(package)_config_opts_aarch64_android += -qpa xcb -$(package)_config_opts_aarch64_android += -no-eglfs -$(package)_config_opts_aarch64_android += -opengl es2 -$(package)_config_opts_aarch64_android += -qt-freetype -$(package)_config_opts_aarch64_android += -no-fontconfig -$(package)_config_opts_aarch64_android += -L $(host_prefix)/lib -$(package)_config_opts_aarch64_android += -I $(host_prefix)/include +$(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 + $(package)_build_env = QT_RCC_TEST=1 $(package)_build_env += QT_RCC_SOURCE_DATE_OVERRIDE=1 endef diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 9ac037ebb5..eb60f7dee0 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -10,6 +10,7 @@ define $(package)_set_vars $(package)_config_opts += --without-libsodium --without-libgssapi_krb5 --without-pgm --without-norm --without-vmci $(package)_config_opts += --disable-libunwind --disable-radix-tree --without-gcov $(package)_config_opts_linux=--with-pic + $(package)_config_opts_android=--with-pic $(package)_cxxflags=-std=c++11 endef diff --git a/depends/packages/zlib.mk b/depends/packages/zlib.mk index 017e7b2cf1..acb02020a8 100644 --- a/depends/packages/zlib.mk +++ b/depends/packages/zlib.mk @@ -11,7 +11,7 @@ $(package)_config_opts+=RANLIB="$($(package)_ranlib)" $(package)_config_opts+=AR="$($(package)_ar)" $(package)_config_opts_darwin+=AR="$($(package)_libtool)" $(package)_config_opts_darwin+=ARFLAGS="-o" -$(package)_config_opts_aarch64_android+=CHOST=$(host) +$(package)_config_opts_android+=CHOST=$(host) endef # zlib has its own custom configure script that takes in options like CC, -- cgit v1.2.3