Commit c3aa6068 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

coreutils: fix libintl, reorder ENV, OPTS & PROGS 

Move OPTS, ENV & PROGS up to the top, the fact that a conditional
(BR2_PACKAGE_BUSYBOX) was before them is bad style and confused me while
i tried to get them grouped together.
This was making all of the new disable OPTS fail, pretty much harmless
but still.

Account for libintl/gettext presence, it's not required in any toolchain
combination but it will fail if it's present, so use it when it's
selected by some other package. Fixes:
http://autobuild.buildroot.net/results/30d/30d0e3d27d8606443479466e60716e6f202a4711/



Add conditional on OpenSSL for faster hashing binaries as pointed again
by Pádraig Brady.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent bd1bbe43

package/coreutils/coreutils.mk

+52 −42
Original line number Diff line number Diff line
@@ -14,40 +14,7 @@ COREUTILS_LICENSE_FILES = COPYING 
COREUTILS_AUTORECONF = YES

COREUTILS_GETTEXTIZE = YES



# If both coreutils and busybox are selected, make certain coreutils

# wins the fight over who gets to have their utils actually installed.

ifeq ($(BR2_PACKAGE_BUSYBOX),y)

COREUTILS_DEPENDENCIES = busybox

endif



ifeq ($(BR2_PACKAGE_ACL),y)

COREUTILS_DEPENDENCIES += acl

else

COREUTILS_CONF_OPTS += --disable-acl

endif



ifeq ($(BR2_PACKAGE_ATTR),y)

COREUTILS_DEPENDENCIES += attr

else

COREUTILS_CONF_OPTS += --disable-xattr

endif



ifeq ($(BR2_PACKAGE_GMP),y)

COREUTILS_DEPENDENCIES += gmp

else

COREUTILS_CONF_OPTS += --without-gmp

endif



ifeq ($(BR2_PACKAGE_LIBCAP),y)

COREUTILS_DEPENDENCIES += libcap

else

COREUTILS_CONF_OPTS += --disable-libcap

endif



COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \

	ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \

	uname join



COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=shebangs

COREUTILS_CONF_ENV = ac_cv_c_restrict=no \

	ac_cv_func_chown_works=yes \

	ac_cv_func_euidaccess=no \
@@ -85,7 +52,50 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ 
	utils_cv_localtime_cache=no \

	PERL=missing



COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=shebangs

COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \

	ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \

	uname join



# If both coreutils and busybox are selected, make certain coreutils

# wins the fight over who gets to have their utils actually installed.

ifeq ($(BR2_PACKAGE_BUSYBOX),y)

COREUTILS_DEPENDENCIES = busybox

endif



ifeq ($(BR2_PACKAGE_ACL),y)

COREUTILS_DEPENDENCIES += acl

else

COREUTILS_CONF_OPTS += --disable-acl

endif



ifeq ($(BR2_PACKAGE_ATTR),y)

COREUTILS_DEPENDENCIES += attr

else

COREUTILS_CONF_OPTS += --disable-xattr

endif



# It otherwise fails to link properly, not mandatory though

ifeq ($(BR2_PACKAGE_GETTEXT),y)

COREUTILS_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr

COREUTILS_DEPENDENCIES += gettext

endif



ifeq ($(BR2_PACKAGE_GMP),y)

COREUTILS_DEPENDENCIES += gmp

else

COREUTILS_CONF_OPTS += --without-gmp

endif



ifeq ($(BR2_PACKAGE_LIBCAP),y)

COREUTILS_DEPENDENCIES += libcap

else

COREUTILS_CONF_OPTS += --disable-libcap

endif



ifeq ($(BR2_PACKAGE_OPENSSL),y)

COREUTILS_CONF_OPTS += --with-openssl=yes

COREUTILS_DEPENDENCIES += openssl

endif



define COREUTILS_POST_INSTALL

	# some things go in root rather than usr