diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-07 19:27:43 +0200 |
|---|---|---|
| committer | René Engelhard <rene@debian.org> | 2024-05-07 20:34:39 +0200 |
| commit | 8b517dfae3558127be332029daf969c548b6b0e5 (patch) | |
| tree | b34ab2b9992852f38d0c9a37bcfe70adc1cb1705 /vcl | |
| parent | 6b62ff0eaf499eb8c2ed4af3413757f38bc97dcb (diff) | |
Revert "make skia into static library"
This reverts commit 6517ce70e50e61441484e7ee7a4be0e265020175.
Reason for revert:
<_rene__> noelgrandin: ping?
<_rene__> noelgrandin: /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/LinkTarget/StaticLibrary/libskia.a: error adding symbols: archive has no index; run ranlib to add one
<_rene__> noelgrandin: caused by your skia static library change. I think I pointed that out once already...
<_rene__> $ ld -v
<_rene__> GNU ld (GNU Binutils for Debian) 2.42
<noelgrandin> hmm, it's not an ld version issue, because I have ld 2.41
<_rene__> gcc version 13.2.0 (Debian 13.2.0-24)
<_rene__> and
<_rene__> Debian clang version 16.0.6 (27)
<_rene__> fwiw, too
<noelgrandin> is that a mergelibs build, or a regular build?
<_rene__> mergelibs
<_rene__> (the "normal" one, not =more)
<_rene__> noelgrandin: ... and LTO
<_rene__> noelgrandin: (saying because googling gives me https://github.com/mesonbuild/meson/issues/8371. and yes, .a is built with clang and the rest with gcc "of course")
<_rene__> noelgrandin: but the Linux release builds _do_ that:
<_rene__> $ grep -E "(lto|merge)" distro-configs/LibreOfficeLinux.conf
<_rene__> --enable-mergelibs
<_rene__> --enable-lto
<_rene__> $
<loircbot> LibreOffice (core) [libreoffice-7-6-7] lohmaier+LibreOffice · readlicense_oo/license/CREDITS.fodt · update credits
<noelgrandin> oh yeah, good spotting
<noelgrandin> yes, LTO is going to be a problem because skia is built with clang
Change-Id: I96c63109d2856c6e4cb22cf9ac945d4cfa9848c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167227
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: René Engelhard <rene@debian.org>
Tested-by: Jenkins
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 4 | ||||
| -rw-r--r-- | vcl/Library_vclplug_osx.mk | 5 | ||||
| -rw-r--r-- | vcl/Library_vclplug_win.mk | 8 |
3 files changed, 1 insertions, 16 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 49f0bbf4b2ac..2d314017bb8b 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -63,7 +63,6 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\ Xrender \ $(if $(filter SKIA,$(BUILD_TYPE)), \ skia \ - libpng \ fontconfig \ ) \ )) @@ -73,9 +72,6 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ -lXext \ -lSM \ -lICE \ - $(if $(filter SKIA,$(BUILD_TYPE)), \ - -lX11-xcb \ - ) \ )) $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk index 82c4928dddb1..0545af8dd33a 100644 --- a/vcl/Library_vclplug_osx.mk +++ b/vcl/Library_vclplug_osx.mk @@ -65,7 +65,6 @@ $(eval $(call gb_Library_use_externals,vclplug_osx,\ harfbuzz \ $(if $(filter SKIA,$(BUILD_TYPE)), \ skia \ - libpng \ ) \ )) @@ -155,10 +154,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vclplug_osx,\ Cocoa \ Carbon \ CoreFoundation \ - $(if $(filter SKIA,$(BUILD_TYPE)), \ - QuartzCore \ - Metal \ - ) \ )) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) diff --git a/vcl/Library_vclplug_win.mk b/vcl/Library_vclplug_win.mk index 8a5ced42ee45..d4656302d4ce 100644 --- a/vcl/Library_vclplug_win.mk +++ b/vcl/Library_vclplug_win.mk @@ -61,10 +61,7 @@ $(eval $(call gb_Library_use_externals,vclplug_win,\ boost_headers \ epoxy \ harfbuzz \ - $(if $(filter SKIA,$(BUILD_TYPE)), \ - skia \ - libpng \ - ) \ + $(if $(filter SKIA,$(BUILD_TYPE)),skia) \ )) $(eval $(call gb_Library_add_exception_objects,vclplug_win,\ @@ -118,9 +115,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_win,\ )) $(eval $(call gb_Library_use_system_win32_libs,vclplug_win,\ - $(if $(filter SKIA,$(BUILD_TYPE)), \ - usp10 \ - ) \ advapi32 \ d2d1 \ dwmapi \ |