summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-03-06 20:58:47 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-08 11:52:56 +0000
commit9f3246522ccb2138aed86f39d25f8a4f7a489559 (patch)
tree7f9c4f0f418a98797b95ca78f3d4eefb927eb71b /meta/recipes-extended
parentfc6c81da79897c95a9c81960a1dee49517f2562a (diff)
downloadpoky-9f3246522ccb2138aed86f39d25f8a4f7a489559.tar.gz
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. (From OE-Core rev: a75ccaea77c8aad8d46e87e8ed4af2e2e0ad5327) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.2.2.bb7
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb5
2 files changed, 6 insertions, 6 deletions
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"
11 11
12PACKAGECONFIG_append_class-target = "\ 12PACKAGECONFIG_append_class-target = "\
13 libxml2 \ 13 libxml2 \
14 ${@bb.utils.filter('DISTRO_FEATURES', 'acl largefile xattr', d)} \ 14 ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \
15" 15"
16 16
17PACKAGECONFIG_append_class-nativesdk = " largefile"
18
19DEPENDS_BZIP2 = "bzip2-replacement-native" 17DEPENDS_BZIP2 = "bzip2-replacement-native"
20DEPENDS_BZIP2_class-target = "bzip2" 18DEPENDS_BZIP2_class-target = "bzip2"
21 19
22PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," 20PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
23PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," 21PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
24PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
25PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib," 22PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib,"
26PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,${DEPENDS_BZIP2}," 23PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,${DEPENDS_BZIP2},"
27PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz," 24PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz,"
@@ -32,6 +29,8 @@ PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo,"
32PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," 29PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle,"
33PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," 30PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4,"
34 31
32EXTRA_OECONF += "--enable-largefile"
33
35SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ 34SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
36 file://non-recursive-extract-and-list.patch \ 35 file://non-recursive-extract-and-list.patch \
37 file://0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch \ 36 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
25 25
26PACKAGECONFIG ??= "openssl pcre zlib \ 26PACKAGECONFIG ??= "openssl pcre zlib \
27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ 27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'lfs', '', d)} \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ 28 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \
30" 29"
31PACKAGECONFIG[lfs] = "--enable-lfs,--disable-lfs" 30
32PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" 31PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
33PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap" 32PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap"
34PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev" 33PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev"
@@ -48,6 +47,8 @@ PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm"
48PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached" 47PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached"
49PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua5.1" 48PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua5.1"
50 49
50EXTRA_OECONF += "--enable-lfs"
51
51inherit autotools pkgconfig update-rc.d gettext systemd 52inherit autotools pkgconfig update-rc.d gettext systemd
52 53
53INITSCRIPT_NAME = "lighttpd" 54INITSCRIPT_NAME = "lighttpd"