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>
This commit is contained in:
parent
069cdbe4dd
commit
afb954e2cb
|
@ -159,7 +159,7 @@ PACKAGECONFIG[db] = "${WITH_DB},--without-db,db,"
|
||||||
|
|
||||||
PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3,"
|
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[openssl] = "--with-openssl,--without-openssl,openssl,"
|
||||||
PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss,"
|
PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss,"
|
||||||
PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt,"
|
PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt,"
|
||||||
|
|
|
@ -161,7 +161,7 @@ PACKAGECONFIG[db] = "${WITH_DB},--without-db,db,"
|
||||||
|
|
||||||
PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3,"
|
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[openssl] = "--with-openssl,--without-openssl,openssl,"
|
||||||
PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss,"
|
PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss,"
|
||||||
PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt,"
|
PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt,"
|
||||||
|
|
Loading…
Reference in New Issue