From 5dcefd18d60b01be84fb1b32ea759613d5216a5f Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Wed, 7 Jul 2010 10:26:50 +0800 Subject: [PATCH] expat: upgrade to 2.0.1 [Patches] KEEP _autotools.patch_: avoid using expat's own libtool.m4. add comment [Recipe] - fix SRC_URI format - no need to export LTCC, as the default will be ${CC} - no need to touch libtool.m4 Signed-off-by: Kevin Tian --- .../expat/{expat-2.0.0 => expat-2.0.1}/autotools.patch | 4 ++++ meta/packages/expat/expat.inc | 4 +--- meta/packages/expat/{expat_2.0.0.bb => expat_2.0.1.bb} | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) rename meta/packages/expat/{expat-2.0.0 => expat-2.0.1}/autotools.patch (78%) rename meta/packages/expat/{expat_2.0.0.bb => expat_2.0.1.bb} (80%) diff --git a/meta/packages/expat/expat-2.0.0/autotools.patch b/meta/packages/expat/expat-2.0.1/autotools.patch similarity index 78% rename from meta/packages/expat/expat-2.0.0/autotools.patch rename to meta/packages/expat/expat-2.0.1/autotools.patch index 77aee3a833..ff1578f47e 100644 --- a/meta/packages/expat/expat-2.0.0/autotools.patch +++ b/meta/packages/expat/expat-2.0.1/autotools.patch @@ -1,3 +1,7 @@ +# avoid to use expat's own *.m4 +# +# comment added by Kevin Tian , 2010-07-07 + diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in --- expat-2.0.0~orig/configure.in 2006-01-10 19:10:46.000000000 -0600 +++ expat-2.0.0/configure.in 2006-02-10 19:12:24.000000000 -0600 diff --git a/meta/packages/expat/expat.inc b/meta/packages/expat/expat.inc index df2243ad0d..d47e340629 100644 --- a/meta/packages/expat/expat.inc +++ b/meta/packages/expat/expat.inc @@ -3,9 +3,7 @@ HOMEPAGE = "http://expat.sourceforge.net/" SECTION = "libs" LICENSE = "MIT" -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ - " -export LTCC = "${CC}" +SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz" inherit autotools diff --git a/meta/packages/expat/expat_2.0.0.bb b/meta/packages/expat/expat_2.0.1.bb similarity index 80% rename from meta/packages/expat/expat_2.0.0.bb rename to meta/packages/expat/expat_2.0.1.bb index a946d9ab50..da2682e41f 100644 --- a/meta/packages/expat/expat_2.0.0.bb +++ b/meta/packages/expat/expat_2.0.1.bb @@ -1,5 +1,5 @@ require expat.inc -PR = "r3" +PR = "r0" SRC_URI += "file://autotools.patch;" @@ -7,7 +7,6 @@ inherit lib_package do_configure_prepend () { rm -f ${S}/conftools/libtool.m4 - touch ${S}/conftools/libtool.m4 } BBCLASSEXTEND = "native nativesdk" -- 2.40.1