diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-03-20 20:56:02 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-03-20 20:56:02 -0700 |
| commit | a8f709faf5895aeabbd01b81f30a1d11a7da7f30 (patch) | |
| tree | 2bb79c82a84a8eafd1d313e0da31232c1fed53ba | |
| parent | 45fb05982c863f934f5b061c9bcec61da41231df (diff) | |
| parent | bde373b8b7e31a236392968dc34d5bd2a4d72da1 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/distro/include/preferred-slugos-versions.inc | 2 | ||||
| -rw-r--r-- | recipes/rpm/rpm_4.4.2.3.bb | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 6bab616cb1..ac2250feaa 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -31,7 +31,7 @@ SRCREV_pn-opkg-sdk = "160" ### alphabetically. Note that the main slugos.inc file ### may include preferred versions for toolchain components. -PREFERRED_VERSION_automake-native ?= "1.10" +PREFERRED_VERSION_automake-native ?= "1.10.2" PREFERRED_VERSION_binutils ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" 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 |