libglib2: assume libpcre built with unicode

Message ID 1517953446-13576-1-git-send-email-matthew.weber@rockwellcollins.com
State Not Applicable
Headers show
Series
  • libglib2: assume libpcre built with unicode
Related show

Commit Message

Matthew Weber Feb. 6, 2018, 9:44 p.m.
The pcre package already explicitly sets unicode, so have the dependent
host-libglib2 do similar.  This resolves a build failure of the
configure test for support of pcre unicode in an build environment
where we stop using absolute paths in our rpath, plus create independent
HOST_DIRs not in the search path.  Currently the configure test
assumes some default search paths as part of the build and can't
find the libpcre.so.x.

Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
---
 package/libglib2/libglib2.mk | 2 ++
 1 file changed, 2 insertions(+)

Comments

Matthew Weber Feb. 7, 2018, 2:02 p.m. | #1
All,

On Tue, Feb 6, 2018 at 10:44 PM, Matt Weber
<matthew.weber@rockwellcollins.com> wrote:
> The pcre package already explicitly sets unicode, so have the dependent
> host-libglib2 do similar.  This resolves a build failure of the
> configure test for support of pcre unicode in an build environment
> where we stop using absolute paths in our rpath, plus create independent
> HOST_DIRs not in the search path.  Currently the configure test
> assumes some default search paths as part of the build and can't
> find the libpcre.so.x.
>
> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
> ---
>  package/libglib2/libglib2.mk | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> index b13da33..7cb7666 100644
> --- a/package/libglib2/libglib2.mk
> +++ b/package/libglib2/libglib2.mk
> @@ -92,6 +92,8 @@ ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
>  LIBGLIB2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm"
>  endif
>
> +HOST_LIBGLIB2_CONF_ENV = glib_cv_pcre_has_unicode=yes
> +
>  HOST_LIBGLIB2_CONF_OPTS = \
>         --disable-coverage \
>         --disable-dtrace \
> --
> 1.9.1
>

I verified this doesn't break current master as well and the value
shows as cached.

checking for Unicode support in PCRE... (cached) yes

Matt

Patch

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index b13da33..7cb7666 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -92,6 +92,8 @@  ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
 LIBGLIB2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm"
 endif
 
+HOST_LIBGLIB2_CONF_ENV = glib_cv_pcre_has_unicode=yes
+
 HOST_LIBGLIB2_CONF_OPTS = \
 	--disable-coverage \
 	--disable-dtrace \