From afb954e2cb8c0f62a16fb4c720d519803ed2a28d Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Mon, 22 Feb 2016 11:33:12 +0000 Subject: rpm: fix building rpm 5 with internal beecrypt RPM 5 cannot be built without beecrypt, therefore the EXTRA_OECONF arguments to pass when the beecrypt PACKAGECONFIG is disabled should enable the internal/bundled beecrypt. [YOCTO #9150] (From OE-Core rev: ed1c47e7c621491b892fb82bd18644dba42212b9) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 2 +- meta/recipes-devtools/rpm/rpm_5.4.14.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/rpm') diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb index 2747a24ce3..660e9df272 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb @@ -159,7 +159,7 @@ PACKAGECONFIG[db] = "${WITH_DB},--without-db,db," PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3," -PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--without-beecrypt,beecrypt," +PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--with-beecrypt=internal,beecrypt," PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss," PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt," diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index 261b280c31..90c4a354bf 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -161,7 +161,7 @@ PACKAGECONFIG[db] = "${WITH_DB},--without-db,db," PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3," -PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--without-beecrypt,beecrypt," +PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--with-beecrypt=internal,beecrypt," PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss," PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt," -- cgit v1.2.3-54-g00ecf