Skip to content

Commit 4db1397

Browse files
UdjinM6kwvg
authored andcommitted
fix glibc compatibility issues
1 parent c6e724b commit 4db1397

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

depends/packages/qt.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ $(package)_patches+= no_sdk_version_check.patch
1414
$(package)_patches+= fix_qpainter_non_determinism.patch fix_lib_paths.patch fix_android_pch.patch
1515
$(package)_patches+= fix_limits_header.patch
1616
$(package)_patches+= fix_montery_include.patch
17+
$(package)_patches += glibc_compatibility.patch
1718

1819
# Update OSX_QT_TRANSLATIONS when this is updated
1920
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
@@ -130,6 +131,8 @@ $(package)_config_opts_linux += -system-freetype
130131
$(package)_config_opts_linux += -fontconfig
131132
$(package)_config_opts_linux += -no-opengl
132133
$(package)_config_opts_linux += -no-feature-vulkan
134+
$(package)_config_opts_linux += -no-feature-getentropy
135+
$(package)_config_opts_linux += -no-feature-renameat2
133136
$(package)_config_opts_linux += -dbus-runtime
134137
$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
135138
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
@@ -224,6 +227,7 @@ define $(package)_preprocess_cmds
224227
patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \
225228
patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
226229
patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \
230+
patch -p1 -i $($(package)_patch_dir)/glibc_compatibility.patch && \
227231
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
228232
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
229233
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Avoid statx@GLIBC_2.28 symbol.
2+
3+
--- old/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
4+
+++ new/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
5+
@@ -95,12 +95,7 @@
6+
#endif
7+
#endif
8+
9+
-#if defined(Q_OS_ANDROID)
10+
-// statx() is disabled on Android because quite a few systems
11+
-// come with sandboxes that kill applications that make system calls outside a
12+
-// whitelist and several Android vendors can't be bothered to update the list.
13+
# undef STATX_BASIC_STATS
14+
-#endif
15+
16+
#ifndef STATX_ALL
17+
struct statx { mode_t stx_mode; }; // dummy

0 commit comments

Comments
 (0)