diff options
| author | Joshua Lock <joshua.g.lock@intel.com> | 2016-02-22 11:33:12 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-22 20:42:47 +0000 |
| commit | afb954e2cb8c0f62a16fb4c720d519803ed2a28d (patch) | |
| tree | 6e9c109465cf1595aeb754872e096e0024c8a3fe /meta/recipes-devtools/rpm | |
| parent | 069cdbe4dda422374412bf3fa734156b21e078bf (diff) | |
| download | poky-afb954e2cb8c0f62a16fb4c720d519803ed2a28d.tar.gz | |
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 <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.14.bb | 2 |
2 files changed, 2 insertions, 2 deletions
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," | |||
| 159 | 159 | ||
| 160 | PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3," | 160 | PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3," |
| 161 | 161 | ||
| 162 | PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--without-beecrypt,beecrypt," | 162 | PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--with-beecrypt=internal,beecrypt," |
| 163 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," | 163 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," |
| 164 | PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss," | 164 | PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss," |
| 165 | PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt," | 165 | 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," | |||
| 161 | 161 | ||
| 162 | PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3," | 162 | PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3," |
| 163 | 163 | ||
| 164 | PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--without-beecrypt,beecrypt," | 164 | PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--with-beecrypt=internal,beecrypt," |
| 165 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," | 165 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," |
| 166 | PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss," | 166 | PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss," |
| 167 | PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt," | 167 | PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt," |