diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-02-20 09:10:19 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-02-20 18:55:16 +0100 |
| commit | 62edc713b59a3dcf08a5f84b1ab0cefccf65da5b (patch) | |
| tree | d62a55f3c8c944f0bc766804670500fb612c2dee /package/util-linux/util-linux.mk | |
| parent | 5b13fc05b37386e64b9f46515b57b5887ee357d9 (diff) | |
| download | buildroot-62edc713b59a3dcf08a5f84b1ab0cefccf65da5b.tar.gz buildroot-62edc713b59a3dcf08a5f84b1ab0cefccf65da5b.zip | |
util-linux: bump to version 2.26
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/util-linux/util-linux.mk')
| -rw-r--r-- | package/util-linux/util-linux.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 0b99618613..cb4b480f77 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -4,8 +4,8 @@ # ################################################################################ -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 -UTIL_LINUX_VERSION_MAJOR = 2.25 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) +UTIL_LINUX_VERSION_MAJOR = 2.26 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -17,7 +17,10 @@ UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 UTIL_LINUX_AUTORECONF = YES UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = host-pkgconf -UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no +# uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support +# (used in logger.c), and the common default is N. +UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \ + $(if $(BR2_TOOLCHAIN_USES_UCLIBC),ac_cv_header_sys_timex_h=no) UTIL_LINUX_CONF_OPTS += \ --disable-rpath \ --disable-makeinstall-chown \ @@ -107,7 +110,8 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) + $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl) # In the host version of util-linux, we so far only require libuuid, # and none of the util-linux utilities, so we disable all of them, unless |
