Skip to content

Commit d9802c8

Browse files
Yang-Wei-Tinghnyman
authored andcommitted
bash: refactor Makefile
Order CONFIGURE_VARS and CONFIGURE_ARGS by ASCII. Signed-off-by: Wei-Ting Yang <williamatcg@gmail.com>
1 parent f8b8ce6 commit d9802c8

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

utils/bash/Makefile

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,39 +50,36 @@ endef
5050
# which is not viable when doing cross compilation and default to no in many
5151
# cases. Grep for 'cross.compil' in aclocal.m4 and config-bot.h for details
5252
#
53-
# bash_cv_job_control_missing: Job control is needed for bash to be used as the
54-
# default shell
53+
# bash_cv_dev_fd: The test is done on build system but OpenWrt currently does
54+
# not have /dev/fd, it provides /proc/self/fd/ instead
5555
#
5656
# bash_cv_getcwd_malloc: The replacement by bash does not work well with
5757
# overlayfs. See "bash getcwd errors when running under OverlayFS"
5858
# http://permalink.gmane.org/gmane.linux.embedded.yocto.general/25204
5959
#
60-
# bash_cv_dev_fd: The test is done on build system but OpenWrt currently does
61-
# not have /dev/fd, it provides /proc/self/fd/ instead
60+
# bash_cv_job_control_missing: Job control is needed for bash to be used as the
61+
# default shell
6262
#
6363
# bash_cv_sys_named_pipes: Required for process substitution
6464
CONFIGURE_VARS += \
65+
CFLAGS_FOR_BUILD="-std=gnu17" \
6566
ac_cv_rl_prefix="$(STAGING_DIR)/usr" \
6667
ac_cv_rl_version="8.0" \
67-
bash_cv_getcwd_malloc=yes \
68-
bash_cv_job_control_missing=present \
6968
bash_cv_dev_fd=whacky \
70-
bash_cv_sys_named_pipes=present \
71-
CFLAGS_FOR_BUILD="-std=gnu17" \
72-
73-
# The following are some other tests that cannot run when cross-compiling
74-
CONFIGURE_VARS += \
7569
bash_cv_func_sigsetjmp=present \
70+
bash_cv_getcwd_malloc=yes \
71+
bash_cv_job_control_missing=present \
7672
bash_cv_printf_a_format=yes \
73+
bash_cv_sys_named_pipes=present
7774

78-
CONFIGURE_ARGS+= \
79-
--with-curses \
80-
--without-bash-malloc \
75+
CONFIGURE_ARGS += \
8176
--bindir=/bin \
8277
--disable-rpath \
8378
--enable-direxpand-default \
8479
--enable-job-control \
85-
--enable-readline
80+
--enable-readline \
81+
--with-curses \
82+
--without-bash-malloc
8683

8784
TARGET_CFLAGS += -std=gnu17
8885

0 commit comments

Comments
 (0)