[libreoffice] 02/02: allow build with gold

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 26e5ec4f995e98b44dc2e865b9479820bd3f8bdd
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 13 11:51:09 2017 +0100

    allow build with gold
---
 changelog |  1 +
 rules     | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 6a8e756..cd29744 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ libreoffice (1:5.3.0-2) UNRELEASED; urgency=medium
   * debian/rules:
     - enable mergelibs only on 64bit archs (and i386), ld goes to OOM on
       mips(el) for example...
+    - allow build with gold (maybe for LTO?)
 
  -- Rene Engelhard <rene at debian.org>  Thu, 02 Feb 2017 09:04:43 +0100
 
diff --git a/rules b/rules
index 2dd118e..27bcc00 100755
--- a/rules
+++ b/rules
@@ -489,7 +489,11 @@ ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
     endif
   endif
 endif
-ENABLE_LTO=n
+#ifeq "$(ENABLE_MERGELIBS)" "y"
+#  ENABLE_LTO=y
+#else
+  ENABLE_LTO=n
+#endif
 USE_OPENCL=y
 #10:15 <@_rene_> ahunt: I remember you wanted to do some endian things? did it 
 #                ever get done?
@@ -766,6 +770,7 @@ else
     endif
   endif 
 endif
+USE_GOLD=n
 
 BUILDDEB_OPTIONS ?= -- -Zxz
 
@@ -1508,6 +1513,11 @@ ifeq ($(ENABLE_LTO),y)
 	CONFIGURE_FLAGS += --enable-lto
 endif
 
+ifeq ($(USE_GOLD),y)
+       DEB_LDFLAGS_MAINT_APPEND += -fuse-ld=gold
+export DEB_LDFLAGS_MAINT_APPEND
+endif
+
 DEJAVU_DEPENDS=fonts-dejavu
 
 # Use compiler cache?  Include ccache in DEB_BUILD_OPTIONS for much faster rebuild times

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