config_host.mk.in | 1 +
configure.ac | 6 +++++-
tools/Library_tl.mk | 2 +-
vcl/Library_vcl.mk | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit cefe5464e6dd0082ce7e4698b2c8eac468e0ab7c
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Fri Jan 12 12:01:29 2024 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Jan 14 19:24:20 2024 +0100
Fix system-libfixmath
Seems distros start to disagree on whether its liblibfixmath or just
libfixmath.
Change-Id: I54a42b2ba050980ae632ab3c82254131cad7787e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161969
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/config_host.mk.in b/config_host.mk.in
index 2ac32c263dc2..faa3915d4e3d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -442,6 +442,7 @@ export LIBXML_JAR=@LIBXML_JAR@
export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@
export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@
export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
+export LIBFIXMATH_LIBS=$(gb_SPACE)@LIBFIXMATH_LIBS@
export LOCKFILE=@LOCKFILE@
export LO_CLANG_CC=@LO_CLANG_CC@
export LO_CLANG_CXX=@LO_CLANG_CXX@
diff --git a/configure.ac b/configure.ac
index 7bc3f5d65f0a..b8ddf562d6c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10668,13 +10668,17 @@ if test "$with_system_libfixmath" = "yes"; then
AC_LANG_PUSH([C++])
AC_CHECK_HEADER([libfixmath/fix16.hpp], [],
[AC_MSG_ERROR([libfixmath/fix16.hpp not found. install libfixmath])],
[])
- AC_CHECK_LIB([libfixmath], [fix16_mul], [:], [AC_MSG_ERROR(libfixmath lib
not found or functional)], [])
+ AC_CHECK_LIB([libfixmath], [fix16_mul], [LIBFIXMATH_LIBS=-llibfixmath],
+ [AC_CHECK_LIB([fixmath], [fix16_mul],
[LIBFIXMATH_LIBS=-lfixmath],
+ [AC_MSG_ERROR(libfixmath lib not found or
functional)])])
AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBFIXMATH=
+ LIBFIXMATH_LIBS=
fi
AC_SUBST([SYSTEM_LIBFIXMATH])
+AC_SUBST([LIBFIXMATH_LIBS])
dnl ===================================================================
dnl Check for system glm
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 99176a7c0902..fee6fb1b4097 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -117,7 +117,7 @@ endif
ifeq ($(SYSTEM_LIBFIXMATH),TRUE)
$(eval $(call gb_Library_add_libs,tl,\
- -llibfixmath \
+ $(LIBFIXMATH_LIBS) \
))
endif
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index fb9687dc47c0..d4c72bfe9c0d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -565,7 +565,7 @@ vcl_headless_freetype_code=\
ifeq ($(SYSTEM_LIBFIXMATH),TRUE)
$(eval $(call gb_Library_add_libs,vcl,\
- -llibfixmath \
+ $(LIBFIXMATH_LIBS) \
))
endif
