summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2015-08-21 01:38:58 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-24 23:47:05 +0100
commit20c6c72ad37df8c2bac118c93705874870dff6b3 (patch)
treeafbe5a2f35b8e7f3e03f4dde6d603b5ae05ba3c1 /meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
parent6b0768e4384967bad1f58e4c9c5c161abc22dba7 (diff)
downloadpoky-20c6c72ad37df8c2bac118c93705874870dff6b3.tar.gz
swig: add package 3.0.6
Ackage from meta-oe to oe-core: meta-oe commit: 9cc54e10efa5ca70d9980f833a8e5a310e5ad21d It's required for libcap-ng to build python bindings. With adding it to oe-core, the copies from following layers could be removed: * meta-oe, meta-selinux, meta-intel-iot-middleware ... (From OE-Core rev: 66923c6776da13bd4513a73c3f7c5e60d74eb0f3) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch')
-rw-r--r--meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
new file mode 100644
index 0000000000..1b1128acab
--- /dev/null
+++ b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
@@ -0,0 +1,64 @@
1From 5c4d6d8538994d5fe9b3b46bfafaf0a605e3bda6 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen.kooi@linaro.org>
3Date: Tue, 17 Jun 2014 08:18:17 +0200
4Subject: [PATCH] configure: use pkg-config for pcre detection
5
6Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
7Upstream-Status: pending
8---
9 configure.ac | 38 +++++++-------------------------------
10 1 file changed, 7 insertions(+), 31 deletions(-)
11
12diff --git a/configure.ac b/configure.ac
13index 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--
631.9.3
64