3 files changed, 6 insertions, 5 deletions

diff --git a/meta/packages/expat/expat-2.0.0/autotools.patch b/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 <kevin.tian@intel.com>, 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
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"