From 422959ac1958cb6c9f857df3cbac7e8acc70a2a4 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Fri, 3 Nov 2017 15:26:42 +0800 Subject: expat: upgrade to 2.2.5 Signed-off-by: Dengke Du Signed-off-by: Ross Burton --- meta/recipes-core/expat/expat/libtool-tag.patch | 34 +++++++++++++++++-------- meta/recipes-core/expat/expat_2.2.3.bb | 4 --- meta/recipes-core/expat/expat_2.2.5.bb | 4 +++ 3 files changed, 27 insertions(+), 15 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.3.bb create mode 100644 meta/recipes-core/expat/expat_2.2.5.bb (limited to 'meta/recipes-core') 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 @@ +From 10342e6b600858b091bc7771e454d9e06af06410 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 2 Nov 2017 18:20:57 +0800 +Subject: [PATCH] Add CC tag to build + Add CC tag to build Upstream-Status: Pending Signed-off-by: Khem Raj +Signed-off-by: Dengke Du +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: expat-2.2.2/Makefile.in -=================================================================== ---- expat-2.2.2.orig/Makefile.in -+++ expat-2.2.2/Makefile.in -@@ -109,7 +109,7 @@ mkdir-init: - - CC = @CC@ - CXX = @CXX@ +diff --git a/Makefile.in b/Makefile.in +index 9560a95..d444bd6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -319,7 +319,7 @@ LIBCURRENT = @LIBCURRENT@ + LIBOBJS = @LIBOBJS@ + LIBREVISION = @LIBREVISION@ + LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ +LIBTOOL = @LIBTOOL@ --tag CC - - INCLUDES = -I$(srcdir)/lib -I. - LDFLAGS = @LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +-- +2.7.4 + 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 @@ -require expat.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" -SRC_URI[md5sum] = "f053af63ef5f39bd9b78d01fbc203334" -SRC_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 @@ +require expat.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" +SRC_URI[md5sum] = "789e297f547980fc9ecc036f9a070d49" +SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6" -- cgit 1.2.3-korg