From 5dcefd18d60b01be84fb1b32ea759613d5216a5f Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Wed, 7 Jul 2010 10:26:50 +0800 Subject: 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 --- meta/packages/expat/expat-2.0.0/autotools.patch | 13 ------------- meta/packages/expat/expat-2.0.1/autotools.patch | 17 +++++++++++++++++ meta/packages/expat/expat.inc | 4 +--- meta/packages/expat/expat_2.0.0.bb | 13 ------------- meta/packages/expat/expat_2.0.1.bb | 12 ++++++++++++ 5 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 meta/packages/expat/expat-2.0.0/autotools.patch create mode 100644 meta/packages/expat/expat-2.0.1/autotools.patch delete mode 100644 meta/packages/expat/expat_2.0.0.bb create mode 100644 meta/packages/expat/expat_2.0.1.bb diff --git a/meta/packages/expat/expat-2.0.0/autotools.patch b/meta/packages/expat/expat-2.0.0/autotools.patch deleted file mode 100644 index 77aee3a833..0000000000 --- a/meta/packages/expat/expat-2.0.0/autotools.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 -@@ -50,9 +50,6 @@ - - AC_CONFIG_HEADER(expat_config.h) - --sinclude(conftools/libtool.m4) --sinclude(conftools/ac_c_bigendian_cross.m4) -- - AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL - diff --git a/meta/packages/expat/expat-2.0.1/autotools.patch b/meta/packages/expat/expat-2.0.1/autotools.patch new file mode 100644 index 0000000000..ff1578f47e --- /dev/null +++ b/meta/packages/expat/expat-2.0.1/autotools.patch @@ -0,0 +1,17 @@ +# 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 +@@ -50,9 +50,6 @@ + + AC_CONFIG_HEADER(expat_config.h) + +-sinclude(conftools/libtool.m4) +-sinclude(conftools/ac_c_bigendian_cross.m4) +- + AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL + 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.0.bb deleted file mode 100644 index a946d9ab50..0000000000 --- a/meta/packages/expat/expat_2.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require expat.inc -PR = "r3" - -SRC_URI += "file://autotools.patch;" - -inherit lib_package - -do_configure_prepend () { - rm -f ${S}/conftools/libtool.m4 - touch ${S}/conftools/libtool.m4 -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/expat/expat_2.0.1.bb b/meta/packages/expat/expat_2.0.1.bb new file mode 100644 index 0000000000..da2682e41f --- /dev/null +++ b/meta/packages/expat/expat_2.0.1.bb @@ -0,0 +1,12 @@ +require expat.inc +PR = "r0" + +SRC_URI += "file://autotools.patch;" + +inherit lib_package + +do_configure_prepend () { + rm -f ${S}/conftools/libtool.m4 +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3