ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-19 21:07:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify the macro for checking stat flavor a bit

Browse Source 
Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2018-01-07 23:44:19 -08:00
parent 0bcb67fa52
commit 1ce2eab963
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -139,15 +139,13 @@ AC_CHECK_PROGS([curl], [curl])
CTNG_SET_KCONFIG_OPTION([curl])
AC_SUBST([curl])
# TBD move the checks/setting kconfig into [IF-BSD] and [IF-GNU] arguments to CTNG_PROG_STAT
# TBD modify CTNG_SET_KCONFIG_OPTION to take an optional argument to which it should be set
CTNG_PROG_STAT
# FIXME: support SET_KCONFIG_OPTION with string values? But then
# again, these checks may be moved into ct-ng script.
test "$acx_cv_stat_flavor" = "BSD" && stat_flavor_BSD=y
CTNG_SET_KCONFIG_OPTION([stat_flavor_BSD])
test "$acx_cv_stat_flavor" = "GNU" && stat_flavor_GNU=y
CTNG_SET_KCONFIG_OPTION([stat_flavor_GNU])
CTNG_PROG_STAT(
[CTNG_SET_KCONFIG_OPTION([stat_flavor_GNU], [y])
CTNG_SET_KCONFIG_OPTION([stat_flavor_BSD])
],
[CTNG_SET_KCONFIG_OPTION([stat_flavor_BSD], [y])
CTNG_SET_KCONFIG_OPTION([stat_flavor_GNU])
])
CTNG_CPU_COUNT

12
m4/ctng_prog_stat.m4
View File

@ -1,5 +1,7 @@
# Check that stat(1) is present and determine the syntax for the format
# string (BSD or GNU).
# string (BSD or GNU). Defines ac_cv_stat_flavor to either GNU or BSD;
# and evaluates either IF-GNU or IF-BSD expression.
# CTNG_PROG_STAT([IF-GNU], [IF-BSD])
AC_DEFUN([CTNG_PROG_STAT],
[AX_REQUIRE_DEFINED([CTNG_CHECK_PROGS_REQ])
CTNG_CHECK_PROGS_REQ([stat], [stat])
@ -11,8 +13,12 @@ AC_DEFUN([CTNG_PROG_STAT],
attr_gnu=$(stat -c '%a' conftest 2>/dev/null)
rm -f conftest
AS_IF([test "$attr_bsd" = "642"],
[acx_cv_stat_flavor=BSD],
[acx_cv_stat_flavor=BSD
$2
],
[test "$attr_gnu" = "642"],
[acx_cv_stat_flavor=GNU],
[acx_cv_stat_flavor=GNU
$1
],
[AC_MSG_ERROR([cannot determine stat(1) format option])])])
])

2
m4/ctng_set_kconfig_option.m4
View File

@ -1,7 +1,7 @@
# Set the kconfig option.
AC_DEFUN([CTNG_SET_KCONFIG_OPTION],
[AS_IF(
[test -n "$$1"],
[test -n "$$1" -o "$2" = "y"],
[AC_SUBST([KCONFIG_$1], ["def_bool y"])],
[AC_SUBST([KCONFIG_$1], ["bool"])])
])