[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-3-8-g539e844
The following commit has been merged in the master branch:
commit 1fbcf3815d89f87909e9003292d27fcf37249830
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)
diff --git a/changelog b/changelog
index 16179a7..296fbbd 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
* debian/patches/icu-4.9.diff: backport fix from libreoffice-3-5
for ICU >= 4.9 support
+ * 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
* debian/rules:
- readd gcc-$(GCC_VERSION), g++-$(GCC_VERSION) build-deps if
@@ -19,7 +22,7 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
* debian/debian/shell-lib-extensions.sh: run unopkg list before trying
to sync; hopefully catches cases where unopkg doesn't (yet) work
- -- Rene Engelhard <rene@debian.org> Thu, 12 Apr 2012 13:10:19 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 12 Apr 2012 14:38:29 +0200
libreoffice (1:3.5.2-3) unstable; urgency=low
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: