build-against-shared-lpsolve
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Sun, 26 Mar 2017 15:06:24 +0000 (15:06 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Sun, 26 Mar 2017 15:06:24 +0000 (15:06 +0000)
Gbp-Pq: Name build-against-shared-lpsolve.diff

RepositoryExternal.mk
configure.ac

index 24bbab79fc2722d983c917377e34fcdea1802117..7705272520198f2adf9fb4fe846604e80e28a3e9 100644 (file)
@@ -2325,7 +2325,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),/usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve)
 $(call gb_LinkTarget_add_defs,$(1),\
        -DSYSTEM_LPSOLVE \
 )
index e6adff05911065b8e0c6e3f589a05a59b53d2cae..660bbb2d251b5a8e68e360bbd1283e8428d83ba6 100644 (file)
Binary files a/configure.ac and b/configure.ac differ