Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > cd8ce32c919af60229fca1d7f792c60e > files > 105

openoffice.org-3.2.0-12.35.fc13.src.rpm

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;
+};