diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:55:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:55:35 +0000 |
| commit | 0e05dd0e4d67d88ca51780dafe4029744269e6fa (patch) | |
| tree | b49073fa569d8d4fbcc7002cf4df72fa840780c1 /debian/patches/fix-system-lpsolve-build.diff | |
| parent | Adding upstream version 4:24.2.0. (diff) | |
| download | libreoffice-0e05dd0e4d67d88ca51780dafe4029744269e6fa.tar.xz libreoffice-0e05dd0e4d67d88ca51780dafe4029744269e6fa.zip | |
Adding debian version 4:24.2.0-1.debian/4%24.2.0-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/fix-system-lpsolve-build.diff')
| -rw-r--r-- | debian/patches/fix-system-lpsolve-build.diff | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/fix-system-lpsolve-build.diff b/debian/patches/fix-system-lpsolve-build.diff new file mode 100644 index 0000000000..fb3cc575ac --- /dev/null +++ b/debian/patches/fix-system-lpsolve-build.diff @@ -0,0 +1,31 @@ +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index 16eb38a..8983376 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -2392,7 +2392,7 @@ ifneq ($(ENABLE_LPSOLVE),) + ifneq ($(SYSTEM_LPSOLVE),) + + define gb_LinkTarget__use_lpsolve +-$(call gb_LinkTarget_add_libs,$(1),-llpsolve55) ++$(call gb_LinkTarget_add_ldflags,$(1),-llpsolve55_pic) + $(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_LPSOLVE \ + ) +diff --git a/configure.ac b/configure.ac +index df7cb4c..9eb5bad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9790,10 +9812,11 @@ if test "$ENABLE_LPSOLVE" = TRUE; then + # some systems need this. Like Ubuntu.... + AC_CHECK_LIB(m, floor) + AC_CHECK_LIB(dl, dlopen) +- AC_CHECK_LIB([lpsolve55], [make_lp], [:], ++ AC_CHECK_LIB(colamd, colamd) ++ AC_CHECK_LIB([lpsolve55_pic], [make_lp], [:], + [ AC_MSG_ERROR(lpsolve library not found or too old.)], []) + LIBS=$save_LIBS +- libo_MINGW_CHECK_DLL([lpsolve55]) ++ libo_MINGW_CHECK_DLL([lpsolve55_pic]) + else + AC_MSG_RESULT([internal]) + SYSTEM_LPSOLVE= |