diff options
author | Koen Kooi <koen.kooi@linaro.org> | 2014-06-17 08:57:59 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-21 10:36:53 +0200 |
commit | e2f0d002cbc81a4dd26daee5e115ab9ea1ab6dd7 (patch) | |
tree | eb6243bc569f31539875758cab0506f7c6778985 /meta-oe/recipes-devtools | |
parent | 117716e668fee5910df7f06a9b2b57bf0ad5285a (diff) | |
download | meta-openembedded-e2f0d002cbc81a4dd26daee5e115ab9ea1ab6dd7.tar.gz |
swig: use pkg-config for pcre detection.
OE-core commit 5870bd272b0b077d0826fb900b251884c1c05061 sabotaged the binconfig way.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch | 64 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/swig/swig_2.0.12.bb | 5 |
2 files changed, 68 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch new file mode 100644 index 000000000..1b1128aca --- /dev/null +++ b/meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From 5c4d6d8538994d5fe9b3b46bfafaf0a605e3bda6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen.kooi@linaro.org> | ||
3 | Date: Tue, 17 Jun 2014 08:18:17 +0200 | ||
4 | Subject: [PATCH] configure: use pkg-config for pcre detection | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen.kooi@linaro.org> | ||
7 | Upstream-Status: pending | ||
8 | --- | ||
9 | configure.ac | 38 +++++++------------------------------- | ||
10 | 1 file changed, 7 insertions(+), 31 deletions(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 0c984b7..6edcec1 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -70,38 +70,14 @@ AC_MSG_RESULT([$with_pcre]) | ||
17 | |||
18 | dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script | ||
19 | if test x"${with_pcre}" = xyes ; then | ||
20 | - AC_MSG_CHECKING([whether to use local PCRE]) | ||
21 | - local_pcre_config=no | ||
22 | - if test -z $PCRE_CONFIG; then | ||
23 | - if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then | ||
24 | - PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config | ||
25 | - local_pcre_config=$PCRE_CONFIG | ||
26 | - fi | ||
27 | - fi | ||
28 | - AC_MSG_RESULT([$local_pcre_config]) | ||
29 | -fi | ||
30 | -AS_IF([test "x$with_pcre" != xno], | ||
31 | - [AX_PATH_GENERIC([pcre], | ||
32 | - [], dnl Minimal version of PCRE we need -- accept any | ||
33 | - [], dnl custom sed script for version parsing is not needed | ||
34 | - [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) | ||
35 | - LIBS="$LIBS $PCRE_LIBS" | ||
36 | - CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS" | ||
37 | - ], | ||
38 | - [AC_MSG_FAILURE([ | ||
39 | - Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions) | ||
40 | - library package. This dependency is needed for configure to complete, | ||
41 | - Either: | ||
42 | - - Install the PCRE developer package on your system (preferred approach). | ||
43 | - - Download the PCRE source tarball, build and install on your system | ||
44 | - as you would for any package built from source distribution. | ||
45 | - - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically | ||
46 | - link against. Run 'Tools/pcre-build.sh --help' for instructions. | ||
47 | - (quite easy and does not require privileges to install PCRE on your system) | ||
48 | - - Use configure --without-pcre to disable regular expressions support in SWIG | ||
49 | - (not recommended).]) | ||
50 | - ]) | ||
51 | + PKG_CHECK_MODULES([PCRE], [libpcre], [ | ||
52 | + AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) | ||
53 | + LIBS="$LIBS $PCRE_LIBS" | ||
54 | + CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS" | ||
55 | + ], [ | ||
56 | + AC_MSG_WARN([$PCRE_PKG_ERRORS]) | ||
57 | ]) | ||
58 | +fi | ||
59 | |||
60 | |||
61 | dnl CCache | ||
62 | -- | ||
63 | 1.9.3 | ||
64 | |||
diff --git a/meta-oe/recipes-devtools/swig/swig_2.0.12.bb b/meta-oe/recipes-devtools/swig/swig_2.0.12.bb index 0fbcfa1bf..d3707ee8c 100644 --- a/meta-oe/recipes-devtools/swig/swig_2.0.12.bb +++ b/meta-oe/recipes-devtools/swig/swig_2.0.12.bb | |||
@@ -1,6 +1,9 @@ | |||
1 | require ${BPN}.inc | 1 | require ${BPN}.inc |
2 | 2 | ||
3 | SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch" | 3 | SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \ |
4 | file://0001-configure-use-pkg-config-for-pcre-detection.patch \ | ||
5 | " | ||
6 | |||
4 | 7 | ||
5 | SRC_URI[md5sum] = "c3fb0b2d710cc82ed0154b91e43085a4" | 8 | SRC_URI[md5sum] = "c3fb0b2d710cc82ed0154b91e43085a4" |
6 | SRC_URI[sha256sum] = "65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7" | 9 | SRC_URI[sha256sum] = "65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7" |