File: fix-system-lpsolve-build.diff

package info (click to toggle)
libreoffice 1%3A7.0.4-4%2Bdeb11u10
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 3,255,188 kB
  • sloc: cpp: 4,130,031; xml: 364,887; java: 276,583; python: 65,680; ansic: 36,276; perl: 32,034; javascript: 16,964; yacc: 10,836; sh: 10,721; makefile: 9,112; cs: 6,600; objc: 1,972; lex: 1,887; awk: 1,002; pascal: 940; asm: 928; php: 79; csh: 20; sed: 5
file content (31 lines) | stat: -rw-r--r-- 1,117 bytes parent folder | download | duplicates (11) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
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=