diff options
| author | fanquake <fanquake@gmail.com> | 2021-12-13 13:40:06 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-12-13 13:41:47 +0800 |
| commit | 83f8e6e7a4dd8e1b49ee03afb7a148cdc22fe674 (patch) | |
| tree | bdfb82d3e3a3f217abd7778f0972d51971cd8279 | |
| parent | ac92ab6da58e34993d0641b98eef5b5f55b6cbf9 (diff) | |
| parent | ef81c51f62e03cb53e65f1ced6120d87f1827c40 (diff) | |
Merge bitcoin/bitcoin#23675: build: Post-pr23489 small cleanups
ef81c51f62e03cb53e65f1ced6120d87f1827c40 build: Use config_opts instead of passing a compiler flag directly (Hennadii Stepanov)
3b8f4e347b09594dcf88f4f2c0bb5afc1265ef51 build, qt: Drop unused CROSS_COMPILE variable for Android builds (Hennadii Stepanov)
e5a81e65d74382a1c8803e5c85ce7f0e25611a8c build, refactor: Re-use `qt_lib_suffix` variable (Hennadii Stepanov)
Pull request description:
This PR suggests small cleanups as follow ups of bitcoin/bitcoin#23489.
ACKs for top commit:
fanquake:
ACK ef81c51f62e03cb53e65f1ced6120d87f1827c40
Tree-SHA512: c834c4f76218c7d567223c49bb86404b02facf61bc9be9a66a984ddd2b2f5e6150ba97071c993ea1faf4da10c87e81df292b3628d4407afccbe9df379ac452d7
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 2 | ||||
| -rw-r--r-- | depends/packages/libxcb_util.mk | 2 | ||||
| -rw-r--r-- | depends/packages/qt.mk | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index fb14ff40ff..874f9afa67 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -161,7 +161,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ _BITCOIN_QT_CHECK_STATIC_PLUGIN([QMacStylePlugin], [-lqmacstyle]) AC_DEFINE([QT_QPA_PLATFORM_COCOA], [1], [Define this symbol if the qt platform is cocoa]) elif test "$TARGET_OS" = "android"; then - QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lplugins_platforms_qtforandroid_$ANDROID_ARCH -ljnigraphics -landroid -lqtfreetype_$ANDROID_ARCH $QT_LIBS" + QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lplugins_platforms_qtforandroid${qt_lib_suffix} -ljnigraphics -landroid -lqtfreetype${qt_lib_suffix} $QT_LIBS" AC_DEFINE([QT_QPA_PLATFORM_ANDROID], [1], [Define this symbol if the qt platform is android]) fi fi diff --git a/depends/packages/libxcb_util.mk b/depends/packages/libxcb_util.mk index 2b65b58597..6f1b9cd7c6 100644 --- a/depends/packages/libxcb_util.mk +++ b/depends/packages/libxcb_util.mk @@ -8,7 +8,7 @@ $(package)_dependencies=libxcb define $(package)_set_vars $(package)_config_opts = --disable-shared --disable-devel-docs --without-doxygen $(package)_config_opts += --disable-dependency-tracking --enable-option-checking -$(package)_cflags += -fPIC +$(package)_config_opts += --with-pic endef define $(package)_preprocess_cmds diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 9824b5bebd..6b2d44dc64 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -167,7 +167,6 @@ $(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-dbus |