[openoffice.org/f13/master] make LD_PRELOAD of libsalalloc_malloc.so work again

[David Tardon]

commit c4b249437994fe1fc5be3ae50b2aee8caaf5d027
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 26 10:44:58 2010 +0200

    make LD_PRELOAD of libsalalloc_malloc.so work again

 openoffice.org.spec    |    5 ++++-
 workspace.fwk120.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 4d86d16..1806d23 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -179,6 +179,7 @@ Patch108: openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
 Patch109: workspace.aw081.patch
 Patch110: 0001-rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
 Patch111: sdext.avoid-running-minimizer-twice.patch
+Patch112: workspace.fwk120.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1788,6 +1789,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch109 -p1 -b .workspace.aw081.patch
 %patch110 -p1 -b .rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
 %patch111 -p1 -b .sdext.avoid-running-minimizer-twice.patch
+%patch112 -p1 -b .workspace.fwk120.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4273,10 +4275,11 @@ fi
 %endif
 
 %changelog
-* Mon Oct 25 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.34
+* Tue Oct 26 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.34
 - Resolves: rhbz#636521 crash in undo in sc
 - Resolves: rhbz#641637 [abrt] [presentation-minimizer] crash in
   OptimizationStats::GetStatusValue (dtardon)
+- make LD_PRELOAD of libsalalloc_malloc.so work again (dtardon)
 
 * Fri Oct 15 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.33
 - Resolves: rhbz#637838 Cropped pictures are displayed in entirety in
diff --git a/workspace.fwk120.patch b/workspace.fwk120.patch
new file mode 100644
index 0000000..f4db020
--- /dev/null
+++ b/workspace.fwk120.patch
@@ -0,0 +1,30 @@
+date:        Fri Oct 30 19:10:16 2009 +0100
+#i105898#: make LD_PRELOAD of libsalalloc_malloc.so work again
+
+diff -r 1014e37a5b5e sal/util/makefile.mk
+--- a/sal/util/makefile.mk	Tue Oct 26 09:50:25 2010 +0200
++++ b/sal/util/makefile.mk	Tue Oct 26 10:38:41 2010 +0200
+@@ -163,6 +163,12 @@
+ .ENDIF
+ .ENDIF
+ 
++# #i105898# required for LD_PRELOAD libsalalloc_malloc.so
++#           if sal is linked with -Bsymbolic-functions
++.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
++SHL1LINKFLAGS+=-Wl,--dynamic-list=salalloc.list
++.ENDIF # .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
++
+ SHL1LIBS+=$(SLB)$/$(TARGET).lib
+ 
+ .IF "$(linkinc)" != ""
+diff -r 1014e37a5b5e sal/util/salalloc.list
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/sal/util/salalloc.list	Tue Oct 26 10:38:41 2010 +0200
+@@ -0,0 +1,7 @@
++{
++        rtl_allocateMemory;
++        rtl_reallocateMemory;
++        rtl_freeMemory;
++        rtl_allocateZeroMemory;
++        rtl_freeZeroMemory;
++};