Patchwork libarchive: Add PACKAGECONFIG for lzo

login
register
mail settings
Submitter Paul Barker
Date April 2, 2014, 12:54 p.m.
Message ID <1396443289-17504-1-git-send-email-paul@paulbarker.me.uk>
Download mbox | patch
Permalink /patch/70017/
State Accepted
Commit 90c2817750b58f8111169afdb185117a783a34ed
Headers show

Comments

Paul Barker - April 2, 2014, 12:54 p.m.
This ensures that the dependency on lzo is deterministic rather than floating.

The configure option to libarchive refers to this library as 'lzo2' but it is
just called 'lzo' in OpenEmbedded.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 meta/recipes-extended/libarchive/libarchive_3.1.2.bb | 1 +
 1 file changed, 1 insertion(+)
Paul Barker - April 2, 2014, 12:58 p.m.
On 2 April 2014 13:54, Paul Barker <paul@paulbarker.me.uk> wrote:
> This ensures that the dependency on lzo is deterministic rather than floating.
>
> The configure option to libarchive refers to this library as 'lzo2' but it is
> just called 'lzo' in OpenEmbedded.
>
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>

This has been tested locally both with and without lzo in
PACKAGECONFIG_pn-libarchive and PACKAGECONFIG_pn-libarchive-native and
it builds correctly in each case.

Thanks,

Patch

diff --git a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
index d5599e0..f90dc02 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
@@ -24,6 +24,7 @@  PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma
 PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,"
 PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2,"
 PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat,"
+PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo,"
 
 SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
            file://libarchive-CVE-2013-0211.patch \