[28/29] libpcre: refresh patches

Message ID	20180305172046.21729-28-ross.burton@intel.com
State	New
Headers	show Delivered-To: patch@linaro.org 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; From: Ross Burton <ross.burton@intel.com> To: openembedded-core@lists.openembedded.org Date: Mon, 5 Mar 2018 17:20:45 +0000 Message-Id: <20180305172046.21729-28-ross.burton@intel.com> In-Reply-To: <20180305172046.21729-1-ross.burton@intel.com> References: <20180305172046.21729-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 28/29] libpcre: refresh patches Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org
Series	[01/29] dbus: remove upstreamed patch \| expand [01/29] dbus: remove upstreamed patch [02/29] dbus-glib: refresh patch [03/29] gobject-introspection: refresh patches [04/29] gtk+: refresh patches [05/29] ovmf: refresh patches [06/29] libxml: refresh patches [07/29] kbd: refresh patches [08/29] dropbear: refresh patches [09/29] nfs-utils: refresh patches [10/29] neard: refresh patches [11/29] iproute2: refresh patches [12/29] squashfs-tools: refresh patches [13/29] mtools: refresh patches [14/29] flex: refresh patches [15/29] ccache: refresh patches [16/29] elfutils: refresh patches [17/29] btrfs-tools: refresh patches [18/29] sysklogd: refresh patches [19/29] watchdog: refresh patches [20/29] unzip: refresh patches [21/29] sysstat: refresh patches [22/29] screen: refresh patches [23/29] lsb: refresh patches [24/29] libaio: refresh patches [25/29] libxcb: refresh patches [26/29] xproto: refresh patches [27/29] vulkan: refresh patches [28/29] libpcre: refresh patches [29/29] usbutils: drop upstreamed patch

Message ID

20180305172046.21729-28-ross.burton@intel.com

State

New

Headers

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; 
From: Ross Burton <ross.burton@intel.com>
To: openembedded-core@lists.openembedded.org
Date: Mon,  5 Mar 2018 17:20:45 +0000
Message-Id: <20180305172046.21729-28-ross.burton@intel.com>
In-Reply-To: <20180305172046.21729-1-ross.burton@intel.com>
References: <20180305172046.21729-1-ross.burton@intel.com>
Subject: [OE-core] [PATCH 28/29] libpcre: refresh patches
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: openembedded-core-bounces@lists.openembedded.org
Errors-To: openembedded-core-bounces@lists.openembedded.org

Series

[01/29] dbus: remove upstreamed patch | expand

Commit Message

Ross Burton March 5, 2018, 5:20 p.m. UTC

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 .../libpcre/libpcre2/pcre-cross.patch              | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

-- 
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/libpcre2/pcre-cross.patch b/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
index 9516caf51aa..871cdfcb7db 100644
--- a/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
+++ b/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
@@ -9,11 +9,11 @@  Upstream-Status: Pending
 
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 
-diff --git a/Makefile.am b/Makefile.am
-index 38f1d41..2bde083 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -298,9 +298,21 @@ bin_SCRIPTS = pcre2-config
+Index: pcre2-10.30/Makefile.am
+===================================================================
+--- pcre2-10.30.orig/Makefile.am
++++ pcre2-10.30/Makefile.am
+@@ -325,9 +325,21 @@ bin_SCRIPTS = pcre2-config
  ## to copy a distributed set of tables that are defined for ASCII code. In this
  ## case, dftables is not needed.
  
@@ -35,13 +35,13 @@  index 38f1d41..2bde083 100644
  src/pcre2_chartables.c: dftables$(EXEEXT)
  	rm -f $@
  	./dftables$(EXEEXT) $@
-diff --git a/configure.ac b/configure.ac
-index d7c57aa..d6eb0aa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,6 +59,23 @@ then
-   fi
- fi
+Index: pcre2-10.30/configure.ac
+===================================================================
+--- pcre2-10.30.orig/configure.ac
++++ pcre2-10.30/configure.ac
+@@ -60,6 +60,23 @@ fi
+ # This is a new thing required to stop a warning from automake 1.12
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
  
 +if test x"$cross_compiling" = xyes; then
 +    CC_FOR_BUILD="${CC_FOR_BUILD-gcc}"