RepositoryExternal.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e5658b209a23a17b3f89fe3eabd1e065513622f1
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Nov 14 20:08:33 2022 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Nov 28 16:24:29 2022 +0100
WASM cairo: link static lib directly
Because bundled cairo is only used on Android currently, and that does
static linking, this doesn't make a difference for LO build.
But it does improve the situation when linking the bundled cairo via
libtool, because libtool unhelpfully finds libcairo.la via -lcairo,
which contains an unhelpful dependency_libs that includes "-lz", which
does not exist anywhere (LO's bundled one is called libzlib.a).
Ideally GNU libtool could be told to ignore .la files, but i don't know
how.
Change-Id: Icaaa0b441e1410a297f6d61afd81e31425138955
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143392
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 025909c36945..9a0eb56b1a7b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1213,8 +1213,8 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
- -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs
-lpixman-1 \
+ $(call gb_UnpackedTarball_get_dir,cairo)/src/.libs/libcairo.a \
+ $(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs/libpixman-1.a \
)
endef
