rpm: Fix autoconf/libtool usage

In order to resolve a host-contamination problem, we re-work the way that
autoconf and friends are invoked during the compilation of RPM.

This has a side effect of fixing another bug where RPM was being renamed
HOST_ARCH-HOST_OS-rpm.  So we remove the "fixes" for that behavior as well.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

1 files changed, 20 insertions, 0 deletions

diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch b/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch
new file mode 100644
index 0000000000..30c5f7b183
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch
@@ -0,0 +1,20 @@
+Using the version of autoconf in poky results in:
+
+configure.ac:11: error: m4_divert_push: cannot change diversion to `GROW' inside m4_expand
+
+without this patch.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+diff -ur rpm-5.1.10.orig/configure.ac rpm-5.1.10/configure.ac
+--- rpm-5.1.10.orig/configure.ac        2010-08-20 17:12:16.000000000 -0500
++++ rpm-5.1.10/configure.ac     2010-09-03 11:34:44.722097327 -0500
+@@ -8,7 +8,7 @@
+ 
+ AC_PREREQ(2.60)
+ AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-devel@rpm5.org])
+-AC_INIT(rpm, [5.1.10], [PACKAGE_BUGREPORT_DEFAULT])
++AC_INIT(rpm, [5.1.10])
+ PACKAGE_TIMESTAMP="2008" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
+ AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
+