summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
diff options
context:
space:
mode:
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.patch63
1 files changed, 0 insertions, 63 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
deleted file mode 100644
index 9e16caecca..0000000000
--- a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From 57a15651b46a0f1f84a4dd15d67d104fbfbe3f6e 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---
10 configure.ac | 39 +++++++--------------------------------
11 1 file changed, 7 insertions(+), 32 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index c060028..a330266 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -49,39 +49,14 @@ AC_MSG_RESULT([$with_pcre])
18
19 dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
20 if test x"${with_pcre}" = xyes ; then
21- AC_MSG_CHECKING([whether to use local PCRE2])
22- local_pcre_config=no
23- if test -z "$PCRE2_CONFIG"; then
24- if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then
25- PCRE2_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre2-config
26- local_pcre_config=$PCRE2_CONFIG
27- fi
28- fi
29- AC_MSG_RESULT([$local_pcre_config])
30-fi
31-AS_IF([test "x$with_pcre" != xno],
32- [AX_PATH_GENERIC([pcre2],
33- [], dnl Minimal version of PCRE we need -- accept any
34- [], dnl custom sed script for version parsing is not needed
35- [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE2 library])
36- LIBS="$LIBS $PCRE2_LIBS"
37- CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS"
38- ],
39- [AC_MSG_FAILURE([
40- Cannot find pcre2-config script from PCRE2 (Perl Compatible Regular Expressions)
41- library package. This dependency is needed for configure to complete,
42- Either:
43- - Install the PCRE2 developer package on your system (preferred approach).
44- - Download the PCRE2 source tarball, build and install on your system
45- as you would for any package built from source distribution.
46- - Use the Tools/pcre-build.sh script to build PCRE2 just for SWIG to statically
47- link against. Run 'Tools/pcre-build.sh --help' for instructions.
48- (quite easy and does not require privileges to install PCRE2 on your system)
49- - Use configure --without-pcre to disable regular expressions support in SWIG
50- (not recommended).])
51- ],
52- [],[],[--libs8])
53+ PKG_CHECK_MODULES([PCRE], [libpcre2], [
54+ AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
55+ LIBS="$LIBS $PCRE_LIBS"
56+ CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
57+ ], [
58+ AC_MSG_WARN([$PCRE_PKG_ERRORS])
59 ])
60+fi
61
62
63 dnl CCache