From d404d5574b0c270656fda4dc051babe82e8828a9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 11 Aug 2017 00:35:28 -0400 Subject: expat: Upgrade to 2.2.3 Signed-off-by: Khem Raj Signed-off-by: Dengke Du Signed-off-by: Richard Purdie --- meta/recipes-core/expat/expat.inc | 1 + meta/recipes-core/expat/expat/libtool-tag.patch | 18 ++++++++++++++++++ meta/recipes-core/expat/expat_2.2.1.bb | 5 ----- meta/recipes-core/expat/expat_2.2.3.bb | 4 ++++ 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-core/expat/expat/libtool-tag.patch delete mode 100644 meta/recipes-core/expat/expat_2.2.1.bb create mode 100644 meta/recipes-core/expat/expat_2.2.3.bb (limited to 'meta') 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" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://autotools.patch \ + file://libtool-tag.patch \ " inherit autotools lib_package 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 @@ +Add CC tag to build + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +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@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = @LIBTOOL@ --tag CC + + INCLUDES = -I$(srcdir)/lib -I. + 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 @@ -require expat.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" - -SRC_URI[md5sum] = "d9c3baeab58774cefc2f04faf29f2cf8" -SRC_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 @@ +require expat.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" +SRC_URI[md5sum] = "f053af63ef5f39bd9b78d01fbc203334" +SRC_URI[sha256sum] = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f" -- cgit 1.2.3-korg