[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-26-g7fd0359
The following commit has been merged in the debian-experimental-3.5 branch:
commit 44913411d17923770c0497a5e187cbb8489a5495
Author: Rene Engelhard <rene@debian.org>
Date: Sat Oct 15 11:06:32 2011 +0200
update fix-system-lpsolve-build.diff with new lpsolve rpath hack for gbuild
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index 105bf79..5557bfa 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -31,3 +31,21 @@ index 91161f1..eb9885e 100644
SOFFICELIB=-lsofficeapp
UNOPKGAPPLIB=-lunopkgapp
TESTLIB=-lunotest
+diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
+index ba9493a..93874b4 100644
+--- libreoffice-3-5.0/sccomp/Library_solver.mk
++++ libreoffice-3-5.0/sccomp/Library_solver.mk
+@@ -49,7 +49,13 @@ $(eval $(call gb_Library_add_linked_libs,solver,\
+ $(gb_STDLIBS) \
+ ))
+
++ifeq ($(SYSTEM_LPSOLVE),YES)
++$(eval $(call gb_Library_add_ldflags,solver, \
++ /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve \
++))
++else
+ $(eval $(call gb_Library_use_external,solver,lpsolve55))
++endif
+
+ $(eval $(call gb_Library_add_exception_objects,solver,\
+ sccomp/source/solver/solver \
--
LibreOffice packaging repository
Reply to: