[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-115-ge038aea
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit d8cd82412f21ac406e0d0cf7a45209cabb2e3064
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 12 14:39:22 2012 +0200
actually set the rpath for gbuild in fix-system-lpsolve-build.diff (fixes also gcc-4.7 build)
Conflicts:
changelog
diff --git a/changelog b/changelog
index cc3baf8..0e11f86 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,10 @@ libreoffice (1:3.5.2-2ubuntu2) precise-proposed; urgency=low
- add ulimit -c unlimited before make check call to catch
backtraces on sporatic soffice.bin crashes "failing" the build;
build-depend on gdb if RUN_MAKE_CHECK=y
+ * cherry-pick 1fbcf3815d89f87909e9003292d27fcf37249830 from debian:
+ - debian/patches/fix-system-lpsolve-build.diff: use -Wl$(COMMA)-rpath as
+ otherwise gbuild strips everything after the , away;
+ makes it actually set the rpath
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 23 Apr 2012 12:56:07 +0200
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index 425b93d..531d238 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -41,7 +41,7 @@ index ba9493a..93874b4 100644
+ifeq ($(SYSTEM_LPSOLVE),YES)
+$(eval $(call gb_Library_add_ldflags,solver, \
-+ /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve \
++ /usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve \
+))
+else
$(eval $(call gb_Library_use_external,solver,lpsolve55))
--
LibreOffice packaging repository
Reply to: