summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2017-11-03 15:26:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-08 22:24:04 +0000
commit9eae1b0cb95954b2a9eb75c45bc5d72117bcb097 (patch)
tree483bef2490b485a8fe1324e17eb8954f2e6436db
parent30961f99599de5934d843efdccd5a2401789036e (diff)
downloadpoky-9eae1b0cb95954b2a9eb75c45bc5d72117bcb097.tar.gz
expat: upgrade to 2.2.5
(From OE-Core rev: 422959ac1958cb6c9f857df3cbac7e8acc70a2a4) Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/expat/expat/libtool-tag.patch34
-rw-r--r--meta/recipes-core/expat/expat_2.2.3.bb4
-rw-r--r--meta/recipes-core/expat/expat_2.2.5.bb4
3 files changed, 27 insertions, 15 deletions
diff --git a/meta/recipes-core/expat/expat/libtool-tag.patch b/meta/recipes-core/expat/expat/libtool-tag.patch
index 3ef4197ce5..0a0aed23e5 100644
--- a/meta/recipes-core/expat/expat/libtool-tag.patch
+++ b/meta/recipes-core/expat/expat/libtool-tag.patch
@@ -1,18 +1,30 @@
1From 10342e6b600858b091bc7771e454d9e06af06410 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 2 Nov 2017 18:20:57 +0800
4Subject: [PATCH] Add CC tag to build
5
1Add CC tag to build 6Add CC tag to build
2 7
3Upstream-Status: Pending 8Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Dengke Du <dengke.du@windriver.com>
11---
12 Makefile.in | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
5 14
6Index: expat-2.2.2/Makefile.in 15diff --git a/Makefile.in b/Makefile.in
7=================================================================== 16index 9560a95..d444bd6 100644
8--- expat-2.2.2.orig/Makefile.in 17--- a/Makefile.in
9+++ expat-2.2.2/Makefile.in 18+++ b/Makefile.in
10@@ -109,7 +109,7 @@ mkdir-init: 19@@ -319,7 +319,7 @@ LIBCURRENT = @LIBCURRENT@
11 20 LIBOBJS = @LIBOBJS@
12 CC = @CC@ 21 LIBREVISION = @LIBREVISION@
13 CXX = @CXX@ 22 LIBS = @LIBS@
14-LIBTOOL = @LIBTOOL@ 23-LIBTOOL = @LIBTOOL@
15+LIBTOOL = @LIBTOOL@ --tag CC 24+LIBTOOL = @LIBTOOL@ --tag CC
16 25 LIPO = @LIPO@
17 INCLUDES = -I$(srcdir)/lib -I. 26 LN_S = @LN_S@
18 LDFLAGS = @LDFLAGS@ 27 LTLIBOBJS = @LTLIBOBJS@
28--
292.7.4
30
diff --git a/meta/recipes-core/expat/expat_2.2.3.bb b/meta/recipes-core/expat/expat_2.2.3.bb
deleted file mode 100644
index abf8450843..0000000000
--- a/meta/recipes-core/expat/expat_2.2.3.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require expat.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79"
3SRC_URI[md5sum] = "f053af63ef5f39bd9b78d01fbc203334"
4SRC_URI[sha256sum] = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f"
diff --git a/meta/recipes-core/expat/expat_2.2.5.bb b/meta/recipes-core/expat/expat_2.2.5.bb
new file mode 100644
index 0000000000..337287b93b
--- /dev/null
+++ b/meta/recipes-core/expat/expat_2.2.5.bb
@@ -0,0 +1,4 @@
1require expat.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79"
3SRC_URI[md5sum] = "789e297f547980fc9ecc036f9a070d49"
4SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"