From bde373b8b7e31a236392968dc34d5bd2a4d72da1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Mar 2009 20:52:10 -0700
Subject: rpm_4.4.2.3.bb: Define EXTRA_OECONF inside do_configure_prepend()
* We use some python vars inside EXTRA_OECONF. So we move
The evaluation to execute time from parse time.
---
recipes/rpm/rpm_4.4.2.3.bb | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
(limited to 'recipes/rpm')
diff --git a/recipes/rpm/rpm_4.4.2.3.bb b/recipes/rpm/rpm_4.4.2.3.bb
index db88282f33..6bdd0edcee 100644
--- a/recipes/rpm/rpm_4.4.2.3.bb
+++ b/recipes/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 sed-native"
-PR = "r13"
+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 \
@@ -21,15 +21,6 @@ ARM_INSTRUCTION_SET = "arm"
acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
-EXTRA_OECONF = "--with-python \
- --with-python-incdir=${STAGING_INCDIR}/${PYTHON_DIR} \
- --with-python-libdir=${libdir}/${PYTHON_DIR} \
- --without-apidocs \
- --without-selinux \
- --without-lua \
- --without-dmalloc \
- --without-efence"
-
PACKAGES += "python-rpm"
FILES_python-rpm = "${libdir}/python*/site-packages/rpm/_*"
@@ -46,6 +37,17 @@ EXTRA_OECONF += "${MUTEX}"
export varprefix = "${localstatedir}"
+do_configure_prepend (){
+ EXTRA_OECONF = "--with-python \
+ --with-python-incdir=${STAGING_INCDIR}/${PYTHON_DIR} \
+ --with-python-libdir=${libdir}/${PYTHON_DIR} \
+ --without-apidocs \
+ --without-selinux \
+ --without-lua \
+ --without-dmalloc \
+ --without-efence"
+}
+
do_configure () {
rm ${S}/popt/ -Rf
rm ${S}/db/dist/configure.in -f
--
cgit v1.2.3