File: build-against-shared-lpsolve.diff

package info (click to toggle)
libreoffice 4%3A25.2.3-2%2Bdeb13u2
  • links: PTS, VCS
  • area: main
  • in suites: trixie
  • size: 3,785,556 kB
  • sloc: cpp: 4,354,935; xml: 450,154; java: 260,044; python: 80,206; ansic: 33,790; perl: 30,351; javascript: 18,236; sh: 12,043; makefile: 10,672; cs: 8,865; yacc: 8,549; objc: 2,131; lex: 1,379; asm: 1,231; awk: 996; pascal: 940; csh: 20; sed: 5
file content (27 lines) | stat: -rw-r--r-- 1,059 bytes parent folder | download | duplicates (8) 
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
 
diff --git a/configure.ac b/configure.ac
index cdae8b5..49f3ba2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9468,8 +9468,9 @@ if test "$with_system_lpsolve" = "yes"; then
         # some systems need this. Like Ubuntu...
         AC_CHECK_LIB(m, floor)
         AC_CHECK_LIB(dl, dlopen)
+        AC_CHECK_LIB(colamd, colamd)
         AC_CHECK_LIB([lpsolve55], [make_lp], [:],
-            [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
+            [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lp_solve])
         LIBS=$save_LIBS
     else
         AC_MSG_RESULT([internal])
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a4daea7..0dea12d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1961,6 +1961,7 @@ ifeq ($(WITH_LPSOLVER),lpsolve)
 
 define gb_LinkTarget__use_lpsolve
 $(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
+$(call gb_LinkTarget_add_ldflags,$(1),-L/usr/lib/lp_solve -Wl$(COMMA)-rpath=/usr/lib/lp_solve)
 $(call gb_LinkTarget_add_defs,$(1),\
 	-DSYSTEM_LPSOLVE \
 )