util-linux: honour largefile distro feature

do_install on micro-image still broken (${bindir}/hexdump lives in
${usrbindir}/hexdump from util-linux POV. Not fixing these.)

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Tom Rini <tom_rini@mentor.com>

diff --git a/recipes/util-linux/files/MCONFIG b/recipes/util-linux/files/MCONFIG
index 3fea2c0..1e87749 100644 (file)
--- a/recipes/util-linux/files/MCONFIG
+++ b/recipes/util-linux/files/MCONFIG
@@ -206,7 +206,6 @@ endif
 
 CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \
                        $(CURSESFLAGS) $(SLANGFLAGS) $(NLSFLAGS) \
-                       -D_FILE_OFFSET_BITS=64 \
                        -DSBINDIR=\"$(SBIN_DIR)\" \
                        -DUSRSBINDIR=\"$(USRSBIN_DIR)\" \
                        -DLOGDIR=\"$(LOG_DIR)\" \

diff --git a/recipes/util-linux/util-linux.inc b/recipes/util-linux/util-linux.inc
index eef4645..e1caf80 100644 (file)
--- a/recipes/util-linux/util-linux.inc
+++ b/recipes/util-linux/util-linux.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system
 SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "zlib ncurses"
-INC_PR = "r16"
+INC_PR = "r17"
 inherit autotools
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
@@ -30,6 +30,8 @@ FILES_util-linux-readprofile = "/usr/sbin/readprofile"
 RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
 RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
 
+CFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'largefile', '-D_FILE_OFFSET_BITS=64', '', d)}"
+
 do_compile () {
        set -e
        install ${WORKDIR}/MCONFIG ${S}/MCONFIG