From patchwork Wed Feb 27 18:33:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 159286 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4757367jad; Wed, 27 Feb 2019 10:34:17 -0800 (PST) X-Google-Smtp-Source: AHgI3Iba/XlE5JprNePKA9YAcA5J3EpcoS6AhgW49PBMIXpJ+1sSvuezGIq+yq+5b0usZsm4odVT X-Received: by 2002:a62:7042:: with SMTP id l63mr3033998pfc.1.1551292457413; Wed, 27 Feb 2019 10:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551292457; cv=none; d=google.com; s=arc-20160816; b=pUIh2RYjZNu+vH829Ew1mQDjE0VZS2T/agWPlyeg3/Nvq6nWMV+vuq4o9kBXFko9sf bITjUN6ZPHJnTD58jI2BkAmoYmVxhlqpPSTZmf0DdniND4zeFMAezCWJH74K0sWRbPc9 HlQFsg2SCrO+fsfIHdzbLWBvJm5tvsvUf3GbG+HZRLbq/6HBc7RGpwSCsFgyV1MPvfd4 IjXBZubLaJOV99RcbIRZEAW/xcm0R6vx6mzmuTogzNYsVofmUFuWBD+tUC9qnPUctsFi O7f5ctd7DnfeOYe/IFQoZ/GEWFPZ72TrNhGVjS+LpuxjqfgiK4Q/zqJzPoDvS62Kh4rO VZqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=lrxUoI+MM+7tA966yfSRtegBh0S5YzSNyDGATNWEjcw=; b=J+4VQVlX3JXQsgxim1QT22lJtKS/edflGX9/ALrSGIXQjBhl+fNxuTRiBByORj6THR 7g68rW3S06GA36d+L9/XPfbixGl3E46ZB0/nqgB2394QJw1P0c60tlB64sVEttBO255l pfNPoOk8UdFQlahu+nwefbJKQr4GmqAFrWgiHvJL6vVUA3lax81XDpvqYyPOafRWbDfg Qi8G9e1MU7UUcmnfItcslAhe8idJn7wsb0uIm0qnd3TsH4X0sPp1HNAGvoWpi4VQm9OV 6ozJHlCjDvE12X7ca0fDogbAjyn3pPH9z+AU06wA6tQHcQ9I3MFr3SMkcEi5Er+PSDCo 3piw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=jei8wNej; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c136si9337014pfb.89.2019.02.27.10.34.17; Wed, 27 Feb 2019 10:34:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=jei8wNej; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 651F57CC7D; Wed, 27 Feb 2019 18:34:14 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mail.openembedded.org (Postfix) with ESMTP id EB2807CB38 for ; Wed, 27 Feb 2019 18:34:01 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id n19so6824194wmi.1 for ; Wed, 27 Feb 2019 10:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=gtxDqRBj3hJEutEAjX24nXcu92GPVOq3rDegnAr4Os4=; b=jei8wNeje/33Zr9LrVUrwX61/JXDSoCn1bVAapa0R+U6yV3CSPflWGybpzjHLylWrk SnKX3XnH3rP0/sLMk5Zh4UOgFG1QYhDVbDx0pJ44T8NnEm5zhqyZvhg+/4ab0RKwpFSG GzO98s54RIiz6xjsuajneBLYzI2EoZtiXE1Z1pmBJopb46Pu8UBqDhq6Kl7tTiOdRGAs 7Z2bdtwA3vor2rmu5AT4x/EfvyeR3FYgQUB62t5V+8DRxy3aEHVcpvRKqNclhxNWDHkE 7vyMhJhhsJwn9XqNdGB525reNT9ZI0CwZcC7EEjcwwyQzRV5Q/qRb+UNBvjeYYqHkXIA nO/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=gtxDqRBj3hJEutEAjX24nXcu92GPVOq3rDegnAr4Os4=; b=MI0wWnu9OgyvFDQnSZEhK7d6UMueqQ3Z9nsQfEWs+fEhn/Q45klynLJbaucJNa/mob Iybv5hOUQLXoWMKReweVlhcv1PcUT9CpCEG1eGjg/4OlzeaWD9ScGadc6I3umBdno5Ib rsR+wiUGAq2FStNpY+bGsdNCuOwf4fXma0CFYWC9UWCijr+XuLTlE8cC6OKhetgh6Y1M cM5DnS2lmYBRU/OUOlFN8WPEJJ20R25cPEXLX9W1jDrkIGDYgSwxqdprXZ90bF47ppyA Sr3uT/RkGgLrsLhlznci6vuSVL6OAb0oGioNddYolIGgT6VspL1aaaGwjCNRbZT+mQAN vXEw== X-Gm-Message-State: APjAAAV99xpPIqeR/Jo8ZGf1sciR8U5pb7m9jMUI8oPat9Ccnyfva/4C OoywSpfI8kQ/ZJGZfHHuYp/aZuuykFM= X-Received: by 2002:a7b:c38d:: with SMTP id s13mr357013wmj.151.1551292442181; Wed, 27 Feb 2019 10:34:02 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id w4sm26158366wrk.85.2019.02.27.10.34.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 10:34:01 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 27 Feb 2019 18:33:55 +0000 Message-Id: <20190227183355.19346-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190227183355.19346-1-ross.burton@intel.com> References: <20190227183355.19346-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] libpcre: enable JIT X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org PCRE has an optional JIT for performance. Add a PACKAGECONFIG for this, enabled by default. Also add a patch so that auto-detection of JIT availablity, which is required to enable the JIT by default, works with out-of-tree builds. Signed-off-by: Ross Burton --- .../libpcre/libpcre/out-of-tree.patch | 26 ++++++++++++++++++++++ meta/recipes-support/libpcre/libpcre_8.43.bb | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libpcre/libpcre/out-of-tree.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch b/meta/recipes-support/libpcre/libpcre/out-of-tree.patch new file mode 100644 index 00000000000..687dcc034da --- /dev/null +++ b/meta/recipes-support/libpcre/libpcre/out-of-tree.patch @@ -0,0 +1,26 @@ +In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is. + +Upstream-Status: Submitted [https://bugs.exim.org/show_bug.cgi?id=2379] +Signed-off-by: Ross Burton + +Index: configure.ac +=================================================================== +--- a/configure.ac (revision 1749) ++++ b/configure.ac (working copy) +@@ -159,6 +159,8 @@ + + if test "$enable_jit" = "auto"; then + AC_LANG(C) ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS=-I$srcdir + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #define SLJIT_CONFIG_AUTO 1 + #include "sljit/sljitConfigInternal.h" +@@ -165,6 +167,7 @@ + #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) + #error unsupported + #endif]])], enable_jit=yes, enable_jit=no) ++ CPPFLAGS=$SAVE_CPPFLAGS + fi + + # Handle --disable-pcregrep-jit (enabled by default) diff --git a/meta/recipes-support/libpcre/libpcre_8.43.bb b/meta/recipes-support/libpcre/libpcre_8.43.bb index e28615a8ba7..08314efb9e4 100644 --- a/meta/recipes-support/libpcre/libpcre_8.43.bb +++ b/meta/recipes-support/libpcre/libpcre_8.43.bb @@ -9,6 +9,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://fix-pcre-name-collision.patch \ + file://out-of-tree.patch \ file://run-ptest \ file://Makefile \ " @@ -23,13 +24,14 @@ S = "${WORKDIR}/pcre-${PV}" PROVIDES += "pcre" DEPENDS += "bzip2 zlib" -PACKAGECONFIG ??= "pcre8 unicode-properties" +PACKAGECONFIG ??= "pcre8 unicode-properties jit" PACKAGECONFIG[pcre8] = "--enable-pcre8,--disable-pcre8" PACKAGECONFIG[pcre16] = "--enable-pcre16,--disable-pcre16" PACKAGECONFIG[pcre32] = "--enable-pcre32,--disable-pcre32" PACKAGECONFIG[pcretest-readline] = "--enable-pcretest-libreadline,--disable-pcretest-libreadline,readline," PACKAGECONFIG[unicode-properties] = "--enable-unicode-properties,--disable-unicode-properties" +PACKAGECONFIG[jit] = "--enable-jit=auto,--disable-jit" BINCONFIG = "${bindir}/pcre-config"