[Libreoffice-commits] .: desktop/Executable_soffice.mk

Stephan Bergmann sbergmann at kemper.freedesktop.org
Mon Mar 19 06:21:26 PDT 2012


 desktop/Executable_soffice.mk |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9019ccb42398b714666f045693e503780d9746ab
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 19 14:18:51 2012 +0100

    soffice.exe must not link against sal3.dll (might fix fdo#44489)
    
    ...as soffice.exe creates the proper environment (PATH) for soffice.bin to be
    able to load URE libs like sal3.dll, so soffice.exe itself should neither be
    able to load nor depend on sal3.dll (and does not depend on anything exported by
    it, anyway).
    
    It is unclear to me how this ever worked (which it presumably did?) with any
    Windows build, either native MSVC or cross-compiled MinGW.  (Maybe MSVC builds
    do not record a dependency from soffice.exe to sal3.dll, noting that the former
    does not import anything from the latter?)

diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index b169898..9ca4d3a 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,soffice))
 $(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
 
 $(eval $(call gb_Executable_add_linked_libs,soffice,\
-    sal \
     advapi32 \
     shell32 \
     shlwapi \


More information about the Libreoffice-commits mailing list