[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-1-38-gc3e807c
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 62e64b29357ccdd01740a5421512a786a0fe1655
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 19 17:28:22 2011 +0200
disable --dynamic-list-cpp-new/--dynamic-list-cpp-typeino as they SIGSEGV ld from binutils-2.21.52.20110707-1ubuntu1
diff --git a/changelog b/changelog
index 87f5aa4..be3bb2a 100644
--- a/changelog
+++ b/changelog
@@ -16,6 +16,9 @@ libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
- fix build with make 3.82: remove space after, in $(call
- fix -javafilter.destop Exec=
* debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
+ * merge from ubuntu-oneiric-3.4:
+ - disable --dynamic-list-cpp-new/--dynamic-list-cpp-typeino
+ as they SIGSEGV ld from binutils-2.21.52.20110707-1ubuntu1
[ Nelson A. de Oliveira ]
* debian/*menu.in, debian/*mime:
diff --git a/patches/disable-dynamic-list-cpp.diff b/patches/disable-dynamic-list-cpp.diff
new file mode 100644
index 0000000..fb19be4
--- /dev/null
+++ b/patches/disable-dynamic-list-cpp.diff
@@ -0,0 +1,46 @@
+Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/disable-dynamic-list-cpp.diff 2011-07-19 17:23:24.315530449 +0200
+@@ -0,0 +1,41 @@
++From 803fd4e9b127241e06d0616d4b47b03b652a37bc Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Tue, 19 Jul 2011 17:20:43 +0200
++Subject: [PATCH 5/5] disable
++ --dynamic-list-cpp-new/--dynamic-list-cpp-typeino as
++ they SIGSEGV ld
++
++ * at least on linking transex in l10ntools/source with ld from binutils-2.21.52.20110707-1ubuntu1
++---
++ solenv/gbuild/platform/unxgcc.mk | 2 --
++ solenv/inc/unxgcc.mk | 2 +-
++ 2 files changed, 1 insertions(+), 3 deletions(-)
++
++diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
++index 7ad122e..2c3d4b5 100755
++--- solenv/gbuild/platform/unxgcc.mk
+++++ solenv/gbuild/platform/unxgcc.mk
++@@ -130,8 +130,6 @@ endif
++
++ ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
++ gb_LinkTarget_LDFLAGS += \
++- -Wl,--dynamic-list-cpp-new \
++- -Wl,--dynamic-list-cpp-typeinfo \
++ -Wl,-Bsymbolic-functions \
++
++ endif
++diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
++index c73333f..8c19388 100644
++--- solenv/inc/unxgcc.mk
+++++ solenv/inc/unxgcc.mk
++@@ -180,7 +180,7 @@ LINKFLAGSRUNPATH_NONE=
++ # flag -Wl,-z,noexecstack sets the NX bit on the stack
++ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
++ .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
++-LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+++LINKFLAGS += -Wl,-Bsymbolic-functions
++ .ENDIF
++
++ # linker flags for linking applications
++--
++1.7.5.4
diff --git a/patches/series b/patches/series
index 5589008..f33a8fe 100644
--- a/patches/series
+++ b/patches/series
@@ -13,3 +13,4 @@ disable-rhino.diff
bsh-hardcode-path.diff
mips-openjdk-jre-paths.diff
autogen.diff
+disable-dynamic-list-cpp.diff
--
LibreOffice packaging repository
Reply to: