[yocto] [meta-selinux][PATCH] swig: use pkg-config for pcre detection.

[Joe MacDonald]

[[meta-selinux][PATCH] swig: use pkg-config for pcre detection.] On 14.07.15 (Tue 22:03) Joe MacDonald wrote:

> Adapted from the original patch submitted to meta-oe for swig 2.0.12.
> 
>    OE-core commit 5870bd272b0b077d0826fb900b251884c1c05061 sabotaged the
>    binconfig way.
> 
> Signed-off-by: Koen Kooi <koen.kooi at linaro.org>

Ugh.  I didn't mean to include this in the commit log since this is my
mangled version of the original patch.  If I push this, I'll indent the
above s-o-b line to indicate it applies to the original patch and not
necessarily to what I've created.

-J.

> Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
> ---
> 
> Building swig-native has been broken for about the last month, the medium-term
> corrective action would probably be to update swig, but that involves more
> testing than I have time for right now.  The long-term corrective action is
> probably to drop swig from meta-selinux, since the one in meta-oe is more
> actively maintained.  This is the immediate, tactical solution, port Koen's
> patch from meta-oe.  core-image-selinux builds happily for me again.
> 
>  ...nfigure-use-pkg-config-for-pcre-detection.patch |   68 ++++++++++++++++++++
>  recipes-devtools/swig/swig_2.0.10.bb               |    4 +-
>  2 files changed, 71 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> 
> diff --git a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> new file mode 100644
> index 0000000..158be36
> --- /dev/null
> +++ b/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> @@ -0,0 +1,68 @@
> +From 35cf4ae2fea9a5b4638f7ea4de8044cea53ce302 Mon Sep 17 00:00:00 2001
> +From: Joe MacDonald <joe_macdonald at mentor.com>
> +Date: Tue, 15 Jul 2014 21:38:57 -0400
> +Subject: [PATCH] configure: use pkg-config for pcre detection
> +
> +Based on the meta-oe swig patch by Koen Kooi, simple backport to the swig
> +version in meta-selinux.
> +
> +Upstream-Status: Backport
> +
> +Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
> +---
> + configure.ac |   38 +++++++-------------------------------
> + 1 file changed, 7 insertions(+), 31 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index c94c2e9..40fe0d0 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -70,38 +70,14 @@ AC_MSG_RESULT([$with_pcre])
> + 
> + dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
> + if test x"${with_pcre}" = xyes ; then 
> +-  AC_MSG_CHECKING([whether to use local PCRE])
> +-  local_pcre_config=no
> +-  if test -z $PCRE_CONFIG; then
> +-    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
> +-      PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
> +-      local_pcre_config=$PCRE_CONFIG
> +-    fi
> +-  fi
> +-  AC_MSG_RESULT([$local_pcre_config])
> +-fi
> +-AS_IF([test "x$with_pcre" != xno],
> +-  [AX_PATH_GENERIC([pcre],
> +-    [], dnl Minimal version of PCRE we need -- accept any
> +-    [], dnl custom sed script for version parsing is not needed
> +-    [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
> +-     LIBS="$LIBS $PCRE_LIBS"
> +-     CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
> +-    ],
> +-    [AC_MSG_FAILURE([
> +-        Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
> +-        library package. This dependency is needed for configure to complete,
> +-        Either:
> +-        - Install the PCRE developer package on your system (preferred approach).
> +-        - Download the PCRE source tarball, build and install on your system
> +-          as you would for any package built from source distribution.
> +-        - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically
> +-          link against. Run 'Tools/pcre-build.sh --help' for instructions.
> +-          (quite easy and does not require privileges to install PCRE on your system)
> +-        - Use configure --without-pcre to disable regular expressions support in SWIG
> +-          (not recommended).])
> +-    ])
> ++  PKG_CHECK_MODULES([PCRE], [libpcre], [
> ++    AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
> ++    LIBS="$LIBS $PCRE_LIBS"
> ++    CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
> ++  ], [
> ++    AC_MSG_WARN([$PCRE_PKG_ERRORS])
> +   ])
> ++fi
> + 
> + 
> + dnl CCache
> +-- 
> +1.7.9.5
> +
> diff --git a/recipes-devtools/swig/swig_2.0.10.bb b/recipes-devtools/swig/swig_2.0.10.bb
> index 312ce11..5f1ff59 100644
> --- a/recipes-devtools/swig/swig_2.0.10.bb
> +++ b/recipes-devtools/swig/swig_2.0.10.bb
> @@ -2,7 +2,9 @@ require ${BPN}.inc
>  
>  PR = "${INC_PR}.0"
>  
> -SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch"
> +SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \
> +            file://0001-configure-use-pkg-config-for-pcre-detection.patch \
> +           "
>  
>  SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
>  SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
-- 
-Joe MacDonald.
:wq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20140715/acaecca7/attachment.pgp>