From patchwork Tue Jun 17 06:57:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 32008 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D163820C81 for ; Tue, 17 Jun 2014 06:58:39 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id dc16sf21316422qab.9 for ; Mon, 16 Jun 2014 23:58:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=/9j3gcHfT0DLk93C5RfQfTJ/AiB5kU2iOL/1G+VKBWc=; b=HsBn4M5itUSdDnDmdkG8VtQCcZ+Wz/3/p1SRYHb7reMDo8q85w6TDQdKH6RmZ37yyL jaTRLwgy94nL814lcizhDGchwzy+ss3nZmfuWBuRTtE8O0MTTorM/f6NMY0u4m1yAhQ4 CvaE6nkuSqu1TpOOjyuGcO/eyhmy/EuEiFdJ0PV9dwMb4+dZHvG4CZl2Ltd6QmFxwQer pSYAB586jDkybl2Q/ZLWZJXMvtOsywNcC55QJrcosRWm+hQ6ra8zqlISrBLO3TNrcP1d h4tPAmf7hCuDOrjZyIllFG/YhDmNzinUVcRtcgMWs++ET4ENjLrKHX0tn6gBuodvNGz7 j9GQ== X-Gm-Message-State: ALoCoQkv2NzAe/Lsk+7FO0AO1zuDkH9iktnf6e4R7IMNux2sU/XGxgMo77NaEZ2qK6LZlYath3xi X-Received: by 10.58.111.40 with SMTP id if8mr658330veb.40.1402988319588; Mon, 16 Jun 2014 23:58:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.38 with SMTP id q35ls2230162qgd.98.gmail; Mon, 16 Jun 2014 23:58:39 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr20469830vcb.0.1402988319443; Mon, 16 Jun 2014 23:58:39 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id qi1si5061440veb.60.2014.06.16.23.58.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Jun 2014 23:58:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id la4so6145784vcb.0 for ; Mon, 16 Jun 2014 23:58:39 -0700 (PDT) X-Received: by 10.52.163.161 with SMTP id yj1mr5860938vdb.35.1402988319332; Mon, 16 Jun 2014 23:58:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp187936vcb; Mon, 16 Jun 2014 23:58:38 -0700 (PDT) X-Received: by 10.66.148.230 with SMTP id tv6mr10809226pab.155.1402988318478; Mon, 16 Jun 2014 23:58:38 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id gz4si16266080pac.61.2014.06.16.23.58.37 for ; Mon, 16 Jun 2014 23:58:38 -0700 (PDT) Received-SPF: none (google.com: openembedded-devel-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4063F6FEF5; Tue, 17 Jun 2014 06:58:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by mail.openembedded.org (Postfix) with ESMTP id 7107F6FEF5 for ; Tue, 17 Jun 2014 06:58:03 +0000 (UTC) Received: by mail-wg0-f49.google.com with SMTP id y10so6638883wgg.20 for ; Mon, 16 Jun 2014 23:58:04 -0700 (PDT) X-Received: by 10.180.83.131 with SMTP id q3mr33326820wiy.31.1402988284172; Mon, 16 Jun 2014 23:58:04 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id dy10sm18484732wib.3.2014.06.16.23.58.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jun 2014 23:58:03 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Tue, 17 Jun 2014 08:57:59 +0200 Message-Id: <1402988279-31972-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCH] swig: use pkg-config for pcre detection. X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 OE-core commit 5870bd272b0b077d0826fb900b251884c1c05061 sabotaged the binconfig way. Signed-off-by: Koen Kooi --- ...nfigure-use-pkg-config-for-pcre-detection.patch | 64 ++++++++++++++++++++++ meta-oe/recipes-devtools/swig/swig_2.0.12.bb | 5 +- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch 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 0000000..1b1128a --- /dev/null +++ b/meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch @@ -0,0 +1,64 @@ +From 5c4d6d8538994d5fe9b3b46bfafaf0a605e3bda6 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 17 Jun 2014 08:18:17 +0200 +Subject: [PATCH] configure: use pkg-config for pcre detection + +Signed-off-by: Koen Kooi +Upstream-Status: pending +--- + configure.ac | 38 +++++++------------------------------- + 1 file changed, 7 insertions(+), 31 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0c984b7..6edcec1 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.9.3 + 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 0fbcfa1..d3707ee 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 @@ require ${BPN}.inc -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] = "c3fb0b2d710cc82ed0154b91e43085a4" SRC_URI[sha256sum] = "65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7"