build-against-shared-lpsolve
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Thu, 27 Jul 2017 23:16:27 +0000 (00:16 +0100)
committerRaspbian forward porter <root@raspbian.org>
Thu, 27 Jul 2017 23:16:27 +0000 (00:16 +0100)
Gbp-Pq: Name build-against-shared-lpsolve.diff

RepositoryExternal.mk
configure.ac

index 109b924e4e115e30faf1734f10448f43bd0a7019..af48ed5db7996df972117132d2d418c784ec070a 100644 (file)
@@ -2367,7 +2367,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 201c79e27320e4879eb2ffc549ae01597400e286..6c8adb943ec0cdd4b16b0b9583294a9d4d2d4e25 100644 (file)
Binary files a/configure.ac and b/configure.ac differ