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-devtools/cmake/cmake_3.7.2.bb | 2 +- meta/recipes-devtools/dosfstools/dosfstools_4.1.bb | 2 +- meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb | 7 ++++--- meta/recipes-devtools/perl/perl_5.24.1.bb | 13 ------------- 4 files changed, 6 insertions(+), 18 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/cmake/cmake_3.7.2.bb b/meta/recipes-devtools/cmake/cmake_3.7.2.bb index 787f33c02b..f566a48cfb 100644 --- a/meta/recipes-devtools/cmake/cmake_3.7.2.bb +++ b/meta/recipes-devtools/cmake/cmake_3.7.2.bb @@ -30,7 +30,7 @@ EXTRA_OECMAKE=" \ -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ -DKWSYS_CHAR_IS_SIGNED=1 \ -DBUILD_CursesDialog=0 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ + -DKWSYS_LFS_WORKS=1 \ " do_install_append_class-nativesdk() { diff --git a/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb b/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb index 458cf877da..69aa81af44 100644 --- a/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb +++ b/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb @@ -20,6 +20,6 @@ inherit autotools pkgconfig EXTRA_OECONF = "--without-udev --enable-compat-symlinks" -CFLAGS += "-D_GNU_SOURCE ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64', '', d)}" +CFLAGS += "-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb index dabb4db382..476fa6f074 100644 --- a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb +++ b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb @@ -29,9 +29,10 @@ BBCLASSEXTEND = "native" inherit autotools pkgconfig -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ -" +PACKAGECONFIG ??= "" + PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap" PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, pyelftools" + +EXTRA_OECONF += "--enable-largefile" diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb index 147e151d74..cf7a8e1218 100644 --- a/meta/recipes-devtools/perl/perl_5.24.1.bb +++ b/meta/recipes-devtools/perl/perl_5.24.1.bb @@ -99,17 +99,6 @@ LDFLAGS_append = " -fstack-protector" # We're almost Debian, aren't we? CFLAGS += "-DDEBIAN" -do_nolargefile() { - sed -i -e "s,\(uselargefiles=\)'define',\1'undef',g" \ - -e "s,\(d_readdir64_r=\)'define',\1'undef',g" \ - -e "s,\(readdir64_r_proto=\)'\w+',\1'0',g" \ - -e "/ccflags_uselargefiles/d" \ - -e "s/-Duselargefiles//" \ - -e "s/-D_FILE_OFFSET_BITS=64//" \ - -e "s/-D_LARGEFILE_SOURCE//" \ - ${S}/Cross/config.sh-${TARGET_ARCH}-${TARGET_OS} -} - do_configure() { # Make hostperl in build directory be the native perl ln -sf ${HOSTPERL} hostperl @@ -182,8 +171,6 @@ do_configure() { config.sh-${TARGET_ARCH}-${TARGET_OS} fi - ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)} - # Update some paths in the configuration sed -i -e 's,@ARCH@-thread-multi,,g' \ -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \ -- cgit 1.2.3-korg