File tree Expand file tree Collapse file tree 2 files changed +19
-0
lines changed Expand file tree Collapse file tree 2 files changed +19
-0
lines changed Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ $(package)_patches += memory_resource.patch
2323$(package)_patches += clang_18_libpng.patch
2424$(package)_patches += utc_from_string_no_optimize.patch
2525$(package)_patches += windows_lto.patch
26+ $(package)_patches += darwin_no_libm.patch
2627$(package)_patches += zlib-timebits64.patch
2728
2829$(package)_qttranslations_file_name =qttranslations-$($(package ) _suffix)
@@ -236,6 +237,7 @@ define $(package)_preprocess_cmds
236237 patch -p1 -i $($(package ) _patch_dir) /utc_from_string_no_optimize.patch && \
237238 patch -p1 -i $($(package ) _patch_dir) /guix_cross_lib_path.patch && \
238239 patch -p1 -i $($(package ) _patch_dir) /windows_lto.patch && \
240+ patch -p1 -i $($(package ) _patch_dir) /darwin_no_libm.patch && \
239241 patch -p1 -i $($(package ) _patch_dir) /zlib-timebits64.patch && \
240242 mkdir -p qtbase/mkspecs/macx-clang-linux &&\
241243 cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
Original file line number Diff line number Diff line change 1+ build: remove explicit -lm link from qttools
2+
3+ This causes issues with at least the macOS cross build, and shouldn't
4+ actually be required anywhere else. GCC with libstdc++ will already get libm.
5+
6+ --- a/qtbase/src/corelib/tools/tools.pri
7+ +++ b/qtbase/src/corelib/tools/tools.pri
8+ @@ -111,9 +111,6 @@ qtConfig(easingcurve) {
9+ tools/qtimeline.cpp
10+ }
11+
12+ - # Note: libm should be present by default becaue this is C++
13+ - unix:!macx-icc:!vxworks:!haiku:!integrity:!wasm: LIBS_PRIVATE += -lm
14+ -
15+ TR_EXCLUDE += ../3rdparty/*
16+
17+ # MIPS DSP
You can’t perform that action at this time.
0 commit comments