[Libreoffice-commits] core.git: Add sal_textenc dependency to cppumaker

Stephan Bergmann sbergman at redhat.com
Wed Jan 8 02:38:09 PST 2014


On 12/30/2013 10:57 PM, Isamu Mogi wrote:
> commit 2cea4c98c2b9eaf46498fb76b73f8dae8e859f3b
> Author: Isamu Mogi <saturday6c at gmail.com>
> Date:   Wed Dec 18 21:43:13 2013 +0900
>
>      Add sal_textenc dependency to cppumaker
>
>      In Japanese localized Windows, cppumaker requires sal_textenclo.dll
>      but that rule isn't written in .mk. It causes build failure.
>
>      Change-Id: Icab74493a4a3b445144bb9d969b79636dbd17162
>      Reviewed-on: https://gerrit.libreoffice.org/7134
>      Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
>      Tested-by: Kohei Yoshida <libreoffice at kohei.us>
>
> diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
> index 26347a0..049e0c7 100644
> --- a/codemaker/Executable_cppumaker.mk
> +++ b/codemaker/Executable_cppumaker.mk
> @@ -13,6 +13,7 @@ $(eval $(call gb_Executable_use_external,cppumaker,boost_headers))
>
>   $(eval $(call gb_Executable_use_libraries,cppumaker,\
>       sal \
> +    sal_textenc \
>       salhelper \
>       unoidl \
>   ))

sal_textenc is a runtime, not a build-time dependency of cppumaker.  Do 
we have gbuild support to express that dependency in a better way?

Stephan



More information about the LibreOffice mailing list