[libreoffice] 01/03: clarify lp-solve-related build patches

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit b8a5a417687ee043d1b20a30cf7a5eff33ce4389
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Oct 24 23:33:58 2016 +0200

    clarify lp-solve-related build patches
---
 changelog                                          |  9 +++++
 ...uild.diff => build-against-shared-lpsolve.diff} |  0
 patches/fix-system-lpsolve-build.diff              | 39 ++++++++++++----------
 patches/series                                     |  3 +-
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/changelog b/changelog
index 46049ac..bb2648f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:5.2.3~rc1-5) UNRELEASED; urgency=medium
+
+  * debian/patches/fix-system-lpsolve-build.diff: rename to ..
+  * build-against-shared-lpsolve.diff: ... this to make the purpose more clear
+  * debian/patches/fix-system-lpsolve-build.diff: add new one adding
+    -llpsolve55_pic test/linkage (disabled)
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 24 Oct 2016 23:31:05 +0200
+
 libreoffice (1:5.2.3~rc1-4) unstable; urgency=medium
 
   * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/build-against-shared-lpsolve.diff
similarity index 100%
copy from patches/fix-system-lpsolve-build.diff
copy to patches/build-against-shared-lpsolve.diff
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index c759445..fb3cc57 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -1,28 +1,31 @@
-diff --git a/configure.ac b/configure.ac
-index cdae8b5..49f3ba2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9468,8 +9468,9 @@ if test "$with_system_lpsolve" = "yes"; then
-         # some systems need this. Like Ubuntu....
-         AC_CHECK_LIB(m, floor)
-         AC_CHECK_LIB(dl, dlopen)
-+        AC_CHECK_LIB(colamd, colamd)
-         AC_CHECK_LIB([lpsolve55], [make_lp], [:],
--            [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
-+            [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lp_solve])
-         LIBS=$save_LIBS
-         libo_MINGW_CHECK_DLL([lpsolve55])
-     else
 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
-index a4daea7..0dea12d 100644
+index 16eb38a..8983376 100644
 --- a/RepositoryExternal.mk
 +++ b/RepositoryExternal.mk
-@@ -1961,7 +1961,7 @@ ifeq ($(WITH_LPSOLVER),lpsolve)
+@@ -2392,7 +2392,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_ldflags,$(1),-llpsolve55_pic)
  $(call gb_LinkTarget_add_defs,$(1),\
  	-DSYSTEM_LPSOLVE \
  )
+diff --git a/configure.ac b/configure.ac
+index df7cb4c..9eb5bad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9790,10 +9812,11 @@ if test "$ENABLE_LPSOLVE" = TRUE; then
+         # some systems need this. Like Ubuntu....
+         AC_CHECK_LIB(m, floor)
+         AC_CHECK_LIB(dl, dlopen)
+-        AC_CHECK_LIB([lpsolve55], [make_lp], [:],
++        AC_CHECK_LIB(colamd, colamd)
++        AC_CHECK_LIB([lpsolve55_pic], [make_lp], [:],
+             [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
+         LIBS=$save_LIBS
+-        libo_MINGW_CHECK_DLL([lpsolve55])
++        libo_MINGW_CHECK_DLL([lpsolve55_pic])
+     else
+         AC_MSG_RESULT([internal])
+         SYSTEM_LPSOLVE=
diff --git a/patches/series b/patches/series
index a6e4f7a..7be9f73 100644
--- a/patches/series
+++ b/patches/series
@@ -4,7 +4,8 @@ jurt-soffice-location.diff
 split-evoab.diff
 debian-debug.diff
 #rhino-build-optional.diff
-fix-system-lpsolve-build.diff
+#fix-system-lpsolve-build.diff
+build-against-shared-lpsolve.diff
 install-fixes.diff
 #mention-java-common-package.diff
 #help-msg-add-package-info.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git