summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-08-11 00:35:28 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-16 00:03:14 +0100
commit9dcc9f116e84fb33fbcd6b9892a3ad792fca5364 (patch)
treeb289e4e1d164160ac03c2f0c55ef02e29c42bd85
parentb3ca36e7d1fa00d5c441ebbc89d719dfea56eb1d (diff)
downloadpoky-9dcc9f116e84fb33fbcd6b9892a3ad792fca5364.tar.gz
expat: Upgrade to 2.2.3
(From OE-Core rev: d404d5574b0c270656fda4dc051babe82e8828a9) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/expat/expat.inc1
-rw-r--r--meta/recipes-core/expat/expat/libtool-tag.patch18
-rw-r--r--meta/recipes-core/expat/expat_2.2.1.bb5
-rw-r--r--meta/recipes-core/expat/expat_2.2.3.bb4
4 files changed, 23 insertions, 5 deletions
diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc
index 9fa0ca2eb3..067687e44a 100644
--- a/meta/recipes-core/expat/expat.inc
+++ b/meta/recipes-core/expat/expat.inc
@@ -6,6 +6,7 @@ LICENSE = "MIT"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
8 file://autotools.patch \ 8 file://autotools.patch \
9 file://libtool-tag.patch \
9 " 10 "
10inherit autotools lib_package 11inherit autotools lib_package
11 12
diff --git a/meta/recipes-core/expat/expat/libtool-tag.patch b/meta/recipes-core/expat/expat/libtool-tag.patch
new file mode 100644
index 0000000000..3ef4197ce5
--- /dev/null
+++ b/meta/recipes-core/expat/expat/libtool-tag.patch
@@ -0,0 +1,18 @@
1Add CC tag to build
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Index: expat-2.2.2/Makefile.in
7===================================================================
8--- expat-2.2.2.orig/Makefile.in
9+++ expat-2.2.2/Makefile.in
10@@ -109,7 +109,7 @@ mkdir-init:
11
12 CC = @CC@
13 CXX = @CXX@
14-LIBTOOL = @LIBTOOL@
15+LIBTOOL = @LIBTOOL@ --tag CC
16
17 INCLUDES = -I$(srcdir)/lib -I.
18 LDFLAGS = @LDFLAGS@
diff --git a/meta/recipes-core/expat/expat_2.2.1.bb b/meta/recipes-core/expat/expat_2.2.1.bb
deleted file mode 100644
index 47827c5576..0000000000
--- a/meta/recipes-core/expat/expat_2.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require expat.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79"
3
4SRC_URI[md5sum] = "d9c3baeab58774cefc2f04faf29f2cf8"
5SRC_URI[sha256sum] = "1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885"
diff --git a/meta/recipes-core/expat/expat_2.2.3.bb b/meta/recipes-core/expat/expat_2.2.3.bb
new file mode 100644
index 0000000000..abf8450843
--- /dev/null
+++ b/meta/recipes-core/expat/expat_2.2.3.bb
@@ -0,0 +1,4 @@
1require expat.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79"
3SRC_URI[md5sum] = "f053af63ef5f39bd9b78d01fbc203334"
4SRC_URI[sha256sum] = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f"