2 files changed, 24 insertions, 2 deletions

diff --git a/meta/packages/rpm/files/disabledwarf.patch b/meta/packages/rpm/files/disabledwarf.patch
new file mode 100644
index 0000000000..6f09cc5965
--- /dev/null
+++ b/meta/packages/rpm/files/disabledwarf.patch
@@ -0,0 +1,21 @@
+Index: rpm-4.4.2.3/configure.ac
+===================================================================
+--- rpm-4.4.2.3.orig/configure.ac       2009-11-30 17:23:22.000000000 +0000
++++ rpm-4.4.2.3/configure.ac    2009-11-30 17:23:52.000000000 +0000
+@@ -448,16 +448,6 @@
+ 
+ WITH_LIBDWARF_INCLUDE=
+ WITH_LIBDWARF_DEBUGEDIT=
+-AC_CHECK_HEADER([dwarf.h], [
+-  AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
+-  WITH_LIBDWARF_DEBUGEDIT="debugedit"
+-],[
+-  if test -d elfutils/libdwarf ; then
+-    AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
+-    WITH_LIBDWARF_INCLUDE="-I\${top_srcdir}/${WITH_ELFUTILS_SUBDIR}/libdwarf"
+-    WITH_LIBDWARF_DEBUGEDIT="debugedit"
+-  fi
+-])
+ AC_SUBST(WITH_LIBDWARF_INCLUDE)
+ AC_SUBST(WITH_LIBDWARF_DEBUGEDIT)
+ 
diff --git a/meta/packages/rpm/rpm_4.4.2.3.bb b/meta/packages/rpm/rpm_4.4.2.3.bb
index b526c1bcdf..5f1128497a 100644
--- a/meta/packages/rpm/rpm_4.4.2.3.bb
+++ b/meta/packages/rpm/rpm_4.4.2.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
 DEPENDS = "zlib beecrypt file popt python"
-PR = "r12"
+PR = "r14"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
@@ -10,7 +10,8 @@ SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://weakdeps.patch;patch=1;pnum=0 \
            file://tagsbackport.patch;patch=1;pnum=0 \
            file://missingok.patch;patch=1;pnum=0 \
-           file://extcond.patch;patch=1;pnum=0"
+           file://extcond.patch;patch=1;pnum=0 \
+           file://disabledwarf.patch;patch=1"
 
 inherit autotools gettext