summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-31 14:39:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-31 15:08:27 +0100
commit97b2a20b55acf76ebaacff0054e0f3c2b4236847 (patch)
tree478398e4eaa550413cfc49c2dc25404d719b3370
parente788fb2b894852f71b1c545abde71b45b9f230dc (diff)
downloadopenembedded-core-97b2a20b55acf76ebaacff0054e0f3c2b4236847.tar.gz
openembedded-core-97b2a20b55acf76ebaacff0054e0f3c2b4236847.tar.bz2
openembedded-core-97b2a20b55acf76ebaacff0054e0f3c2b4236847.zip
dpkg: Add PACKAGECONFIG for liblzma and enable it
liblzma is part of xz and we already build it but configure it out. This makes no sense. Enabling it means we gain multithreaded compression and it speeds dpkg-deb up massively. It also removes the fork overhead of separate xz processes. Turning the existing config into a PACKAGECONFIG and turning it on by default therefore makes best use of what we have available. The manual RDEPENDS are no longer needed since it uses liblzma which is picked up by the shlibs code magically. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 6abe3ae062..870117a325 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -4,8 +4,8 @@ SECTION = "base"
DEPENDS = "zlib bzip2 perl ncurses"
DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native"
-RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz perl"
-RDEPENDS_${PN}_class-native = "xz-native"
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl"
+RDEPENDS_${PN}_class-native = ""
UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/"
@@ -28,10 +28,12 @@ EXTRA_OECONF = "\
--enable-start-stop-daemon \
--with-libz \
--with-libbz2 \
- --without-liblzma \
--without-libselinux \
"
+PACKAGECONFIG = "liblzma"
+PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz"
+
EXTRA_OECONF += "TAR=tar"
EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}"