Skip to content

Commit 83f8e6e

Browse files
committed
Merge bitcoin/bitcoin#23675: build: Post-pr23489 small cleanups
ef81c51 build: Use config_opts instead of passing a compiler flag directly (Hennadii Stepanov) 3b8f4e3 build, qt: Drop unused CROSS_COMPILE variable for Android builds (Hennadii Stepanov) e5a81e6 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 ef81c51 Tree-SHA512: c834c4f76218c7d567223c49bb86404b02facf61bc9be9a66a984ddd2b2f5e6150ba97071c993ea1faf4da10c87e81df292b3628d4407afccbe9df379ac452d7
2 parents ac92ab6 + ef81c51 commit 83f8e6e

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

build-aux/m4/bitcoin_qt.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
161161
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QMacStylePlugin], [-lqmacstyle])
162162
AC_DEFINE([QT_QPA_PLATFORM_COCOA], [1], [Define this symbol if the qt platform is cocoa])
163163
elif test "$TARGET_OS" = "android"; then
164-
QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lplugins_platforms_qtforandroid_$ANDROID_ARCH -ljnigraphics -landroid -lqtfreetype_$ANDROID_ARCH $QT_LIBS"
164+
QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lplugins_platforms_qtforandroid${qt_lib_suffix} -ljnigraphics -landroid -lqtfreetype${qt_lib_suffix} $QT_LIBS"
165165
AC_DEFINE([QT_QPA_PLATFORM_ANDROID], [1], [Define this symbol if the qt platform is android])
166166
fi
167167
fi

depends/packages/libxcb_util.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(package)_dependencies=libxcb
88
define $(package)_set_vars
99
$(package)_config_opts = --disable-shared --disable-devel-docs --without-doxygen
1010
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
11-
$(package)_cflags += -fPIC
11+
$(package)_config_opts += --with-pic
1212
endef
1313

1414
define $(package)_preprocess_cmds

depends/packages/qt.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ $(package)_config_opts_android = -xplatform android-clang
167167
$(package)_config_opts_android += -android-sdk $(ANDROID_SDK)
168168
$(package)_config_opts_android += -android-ndk $(ANDROID_NDK)
169169
$(package)_config_opts_android += -android-ndk-platform android-$(ANDROID_API_LEVEL)
170-
$(package)_config_opts_android += -device-option CROSS_COMPILE="$(host)-"
171170
$(package)_config_opts_android += -egl
172171
$(package)_config_opts_android += -qpa xcb
173172
$(package)_config_opts_android += -no-dbus

0 commit comments

Comments
 (0)