[OE-core] [PATCH 9/9] gettext: rationalise optional dependencies

[Burton, Ross]

Eek, thanks.

Ross

On 21 January 2018 at 15:30, Martin Jansa <martin.jansa at gmail.com> wrote:

> --without-included-glib seems to cause configure to find glib from the
> host:
>
> ERROR: This autoconf log indicates errors, it looked at host include
> and/or library paths while determining system capabilities.
>
> gettext/0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning: include
> location "/usr/include/glib-2.0" is unsafe for cross-compilation
> [-Wpoison-system-directories]
>
> I'm testing it with added --with-libglib-2.0-prefix to see if it fixes the
> issue. I've added the same to other added PACKAGECONFIGs:
> -PACKAGECONFIG[croco] = "--without-included-libcroco,-
> -with-included-libcroco,libcroco"
> -PACKAGECONFIG[glib] = "--without-included-glib,--
> with-included-glib,glib-2.0"
> -PACKAGECONFIG[libxml] = "--without-included-libxml,--
> with-included-libxml,libxml2"
> -PACKAGECONFIG[libunistring] = "--without-included-
> libunistring,--with-included-libunistring,libunistring"
> +PACKAGECONFIG[croco] = "--with-libcroco-0.6-prefix=${STAGING_LIBDIR}/..
> --without-included-libcroco,--with-included-libcroco,libcroco"
> +PACKAGECONFIG[glib] = "--with-libglib-2.0-prefix=${STAGING_LIBDIR}/..
> --without-included-glib,--with-included-glib,glib-2.0"
> +PACKAGECONFIG[libxml] = "--with-libxml2-prefix=${STAGING_LIBDIR}/..
> --without-included-libxml,--with-included-libxml,libxml2"
> +PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_LIBDIR}/..
> --without-included-libunistring,--with-included-libunistring,libunistring"
>
> Not sure if it's worth adding other prefixes for curses related
> PACKAGECONFIG
> PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${
> STAGING_LIBDIR}/..,--disable-curses,ncurses,"
>
>   --with-libncurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
> DIR/lib
>   --without-libncurses-prefix     don't search for PACKLIBS in includedir
> and libdir
>   --with-libxcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
> DIR/lib
>   --without-libxcurses-prefix     don't search for PACKLIBS in includedir
> and libdir
>   --with-libcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
> DIR/lib
>   --without-libcurses-prefix     don't search for PACKLIBS in includedir
> and libdir
>
>
>
> On Mon, Jan 8, 2018 at 5:00 PM, Ross Burton <ross.burton at intel.com> wrote:
>
>> gettext has optional dependencies on libxml2, glib, libcroco and
>> libunistring.
>> If they're not available then gettext will use internal copies, but it
>> can also
>> use system libraries.
>>
>> For gettext-native continue to use the internal copies to get this
>> building
>> sooner rather than later, but for target use the system shared libraries.
>>
>> Also gettext 0.19.7 onwards swapped expat for libxm2, so remove the build
>> dependency on expat.
>>
>> Signed-off-by: Ross Burton <ross.burton at intel.com>
>> ---
>>  meta/recipes-core/gettext/gettext_0.19.8.1.bb | 14 +++++++++-----
>>  1 file changed, 9 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> index 46ea68ff5b5..25ff601a6be 100644
>> --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> @@ -8,7 +8,7 @@ SECTION = "libs"
>>  LICENSE = "GPLv3+ & LGPL-2.1+"
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>>
>> -DEPENDS = "gettext-native virtual/libiconv expat"
>> +DEPENDS = "gettext-native virtual/libiconv"
>>  DEPENDS_class-native = "gettext-minimal-native"
>>  PROVIDES = "virtual/libintl virtual/gettext"
>>  PROVIDES_class-native = "virtual/gettext-native"
>> @@ -33,18 +33,22 @@ EXTRA_OECONF += "--without-lispdir \
>>                   --disable-native-java \
>>                   --disable-openmp \
>>                   --disable-acl \
>> -                 --with-included-glib \
>>                   --without-emacs \
>>                   --without-cvs \
>>                   --without-git \
>> -                 --with-included-libxml \
>> -                 --with-included-libcroco \
>> -                 --with-included-libunistring \
>>                  "
>>  EXTRA_OECONF_append_class-target = " \
>>                   --with-bisonlocaledir=${datadir}/locale \
>>  "
>>
>> +PACKAGECONFIG ??= "croco glib libxml libunistring"
>> +PACKAGECONFIG_class-native = ""
>> +
>> +PACKAGECONFIG[croco] = "--without-included-libcroco,-
>> -with-included-libcroco,libcroco"
>> +PACKAGECONFIG[glib] = "--without-included-glib,--wit
>> h-included-glib,glib-2.0"
>> +PACKAGECONFIG[libxml] = "--without-included-libxml,--w
>> ith-included-libxml,libxml2"
>> +PACKAGECONFIG[libunistring] = "--without-included-libunistri
>> ng,--with-included-libunistring,libunistring"
>> +
>>  acpaths = '-I ${S}/gettext-runtime/m4 \
>>             -I ${S}/gettext-tools/m4'
>>
>> --
>> 2.11.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180122/fc5d25b3/attachment-0002.html>