[Libreoffice-commits] core.git: 5 commits - Library_merged.mk sal/osl sfx2/source solenv/gbuild vcl/unx

[Miklos Vajna]

Hi Peter,

On Sun, Mar 31, 2013 at 08:34:05AM -0700, Peter Foley <pefoley2 at verizon.net> wrote:
> commit 8b561c0012546aabbaff33b32a79833997aa8902
> Author: Peter Foley <pefoley2 at verizon.net>
> Date:   Sat Mar 30 19:12:22 2013 -0400
> 
>     If you can't load a shared library it should be a warning
>     
>     This has bitten me more than once when working on Library_merged.
>     
>     Change-Id: I829f5d010b6df2935fd191bdec9bac04bb003f16
> 
> diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
> index 9169768..43ff2a4e 100644
> --- a/sal/osl/unx/module.cxx
> +++ b/sal/osl/unx/module.cxx
> @@ -160,7 +160,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR
>              ((nRtldMode & SAL_LOADMODULE_GLOBAL) ? RTLD_GLOBAL : RTLD_LOCAL);
>          void* pLib = dlopen(pModuleName, rtld_mode);
>  
> -        SAL_INFO_IF(
> +        SAL_WARN_IF(
>              pLib == 0, "sal.osl",
>              "dlopen(" << pModuleName << ", " << rtld_mode << "): "
>                  << dlerror());

Uhm, is this really necessary? If you want to work on Library_merged,
set the SAL_LOG env var as necessary. With this change, now I get these
warnings during _every_ startup:

warn:sal.osl:29154:1:sal/osl/unx/module.cxx:166: dlopen(/home/vmiklos/git/libreoffice/master/solver/unxlngx6/installation/opt/program/libvclplug_kde4lo.so, 1): /home/vmiklos/git/libreoffice/master/solver/unxlngx6/installation/opt/program/libvclplug_kde4lo.so: cannot open shared object file: No such file or directory
warn:sal.osl:29154:1:sal/osl/unx/module.cxx:166: dlopen(/home/vmiklos/git/libreoffice/master/solver/unxlngx6/installation/opt/program/libvclplug_kdelo.so, 1): /home/vmiklos/git/libreoffice/master/solver/unxlngx6/installation/opt/program/libvclplug_kdelo.so: cannot open shared object file: No such file or directory

Yes, it's fine that VCL tries to load the libvclplug_kdelo.so, as I'm on
KDE, and no, my build does not explicitly enable KDE support, so it's
expected that the dlopen will fail.

IOW I would like to revert this change, or at least please make it a
warning only in case that merged library thing is enabled at
configure-time.

Thanks,

Miklos
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20130402/ccba049a/attachment-0001.pgp>