diff options
| author | fanquake <fanquake@gmail.com> | 2022-03-21 09:54:51 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-05-22 08:51:33 +0100 |
| commit | bab287d1bab2c02b5fab3285f2678c15316d31c2 (patch) | |
| tree | 7a1d515cfdb2face9775b47298b7159bebc95ddd /depends | |
| parent | 0388dd702b8d76c83bd17fc339d8c63904234fb0 (diff) | |
| download | bitcoin-bab287d1bab2c02b5fab3285f2678c15316d31c2.tar.xz | |
depends: don't use -no_warning_for_no_symbols in macOS qt build
Not supported by llvm-ar / llvm-ranlib.
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/qt.mk | 2 | ||||
| -rw-r--r-- | depends/patches/qt/no_warnings_for_symbols.patch | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index d057b2d410..e8ee35e516 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -15,6 +15,7 @@ $(package)_patches += no-xlib.patch $(package)_patches += fix_android_jni_static.patch $(package)_patches += dont_hardcode_pwd.patch $(package)_patches += qtbase-moc-ignore-gcc-macro.patch +$(package)_patches += no_warnings_for_symbols.patch $(package)_patches += rcc_hardcode_timestamp.patch $(package)_patches += duplicate_lcqpafonts.patch $(package)_patches += guix_cross_lib_path.patch @@ -247,6 +248,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \ patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \ patch -p1 -i $($(package)_patch_dir)/memory_resource.patch && \ + patch -p1 -i $($(package)_patch_dir)/no_warnings_for_symbols.patch && \ patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \ patch -p1 -i $($(package)_patch_dir)/duplicate_lcqpafonts.patch && \ patch -p1 -i $($(package)_patch_dir)/utc_from_string_no_optimize.patch && \ diff --git a/depends/patches/qt/no_warnings_for_symbols.patch b/depends/patches/qt/no_warnings_for_symbols.patch new file mode 100644 index 0000000000..11cdc599ed --- /dev/null +++ b/depends/patches/qt/no_warnings_for_symbols.patch @@ -0,0 +1,11 @@ +--- a/qtbase/mkspecs/features/mac/no_warn_empty_obj_files.prf ++++ b/qtbase/mkspecs/features/mac/no_warn_empty_obj_files.prf +@@ -1,7 +1,7 @@ + # Prevent warnings about object files without any symbols. This is a common + # thing in Qt as we tend to build files unconditionally, and then use ifdefs + # to compile out parts that are not relevant. +-QMAKE_RANLIB += -no_warning_for_no_symbols ++# QMAKE_RANLIB += -no_warning_for_no_symbols + + # We have to tell 'ar' to not run ranlib by itself + QMAKE_AR += -S |