From a75ccaea77c8aad8d46e87e8ed4af2e2e0ad5327 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 6 Mar 2017 20:58:47 -0800 Subject: meta: start to ignore the largefile distro feature The largefile distro feature has been enabled by default in oe-core for a long time and, more recently, also in poky-tiny. Building without the largefile distro feature receives little or no testing. Many packages now enable LFS without exposing a configure option, so there should be very little expectation that disabling the distro feature will result in a distro which globally disables LFS. Respecting the distro feature adds a maintenance over-head and may be the source of configurations oddities (e.g. dbus-native currently builds with LFS disabled for no clear reason - fixed by this commit). Ignore the largefile distro feature more widely, as a first step towards deprecating and eventually removing it. Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- meta/recipes-extended/libarchive/libarchive_3.2.2.bb | 7 +++---- meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb index 5e9c1184b6..da959a2f55 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb @@ -11,17 +11,14 @@ PACKAGECONFIG ?= "zlib bz2" PACKAGECONFIG_append_class-target = "\ libxml2 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl largefile xattr', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \ " -PACKAGECONFIG_append_class-nativesdk = " largefile" - DEPENDS_BZIP2 = "bzip2-replacement-native" DEPENDS_BZIP2_class-target = "bzip2" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib," PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,${DEPENDS_BZIP2}," PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz," @@ -32,6 +29,8 @@ PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo," PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," +EXTRA_OECONF += "--enable-largefile" + SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://non-recursive-extract-and-list.patch \ file://0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch \ diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb index 55218518fa..08dda33606 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb @@ -25,10 +25,9 @@ SRC_URI[sha256sum] = "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760f PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'lfs', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ " -PACKAGECONFIG[lfs] = "--enable-lfs,--disable-lfs" + PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap" PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev" @@ -48,6 +47,8 @@ PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm" PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached" PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua5.1" +EXTRA_OECONF += "--enable-lfs" + inherit autotools pkgconfig update-rc.d gettext systemd INITSCRIPT_NAME = "lighttpd" -- cgit v1.2.3