| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From 879578d3f4dc9bc42aa433b1fb6b584564f83617 Mon Sep 17 00:00:00 2001 |
| 2 | From: Eneas U de Queiroz <cotequeiroz@gmail.com> |
| 3 | Date: Wed, 21 Jul 2021 13:38:24 -0300 |
| 4 | Subject: openwrt: don't quote $(SHELL) in Makefile.am |
| 5 | |
| 6 | This allows to use SHELL="env bash" to get a controlled enviroment. |
| 7 | |
| 8 | Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> |
| 9 | |
| 10 | --- a/Makefile.am |
| 11 | +++ b/Makefile.am |
| 12 | @@ -46,7 +46,7 @@ EXTRA_LTLIBRARIES = |
| 13 | # Using 'cd' in backquotes may print the directory name, use this instead: |
| 14 | lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
| 15 | |
| 16 | -git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '--fallback' '$(VERSION)' '.tarball-version' |
| 17 | +git_version_gen = $(SHELL) '$(aux_dir)/git-version-gen' '--fallback' '$(VERSION)' '.tarball-version' |
| 18 | rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | $(SED) 's|-.*$$||'` |
| 19 | |
| 20 | |
| 21 | @@ -306,7 +306,7 @@ libtool: $(ltmain_sh) $(config_status) $ |
| 22 | if test 0 = '$(AM_DEFAULT_VERBOSITY)' && test 1 != '$(V)'; \ |
| 23 | then echo " GEN " $@; \ |
| 24 | else echo '$(SHELL) $(top_builddir)/config.status "$@"'; fi; \ |
| 25 | - cd '$(top_builddir)' && '$(SHELL)' ./config.status '$@'; \ |
| 26 | + cd '$(top_builddir)' && $(SHELL) ./config.status '$@'; \ |
| 27 | fi |
| 28 | |
| 29 | |
| 30 | @@ -789,13 +789,13 @@ testsuite_deps_uninstalled = $(testsuite |
| 31 | # Hook the test suite into the check rule |
| 32 | check-local: $(testsuite_deps_uninstalled) |
| 33 | $(AM_V_at)$(CD_TESTDIR); \ |
| 34 | - CONFIG_SHELL='$(SHELL)' '$(SHELL)' "$$abs_srcdir/$(TESTSUITE)" \ |
| 35 | + CONFIG_SHELL=$(SHELL) $(SHELL) "$$abs_srcdir/$(TESTSUITE)" \ |
| 36 | $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) |
| 37 | |
| 38 | # Run the test suite on the *installed* tree. |
| 39 | installcheck-local: $(testsuite_deps) |
| 40 | $(AM_V_at)$(CD_TESTDIR); \ |
| 41 | - CONFIG_SHELL='$(SHELL)' '$(SHELL)' "$$abs_srcdir/$(TESTSUITE)" \ |
| 42 | + CONFIG_SHELL=$(SHELL) $(SHELL) "$$abs_srcdir/$(TESTSUITE)" \ |
| 43 | $(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) \ |
| 44 | AUTOTEST_PATH='$(exec_prefix)/bin' |
| 45 | |
| 46 | @@ -807,7 +807,7 @@ check-noninteractive-old: |
| 47 | .PHONY: check-noninteractive-new |
| 48 | check-noninteractive-new: $(testsuite_deps_uninstalled) |
| 49 | $(AM_V_at)$(CD_TESTDIR); \ |
| 50 | - CONFIG_SHELL='$(SHELL)' '$(SHELL)' "$$abs_srcdir/$(TESTSUITE)" \ |
| 51 | + CONFIG_SHELL=$(SHELL) $(SHELL) "$$abs_srcdir/$(TESTSUITE)" \ |
| 52 | $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) \ |
| 53 | -k '!interactive' INNER_TESTSUITEFLAGS=',!interactive' \ |
| 54 | $(TESTSUITEFLAGS) |
| 55 | @@ -816,7 +816,7 @@ check-noninteractive-new: $(testsuite_de |
| 56 | .PHONY: check-interactive |
| 57 | check-interactive: $(testsuite_deps_uninstalled) |
| 58 | $(AM_V_at)$(CD_TESTDIR); \ |
| 59 | - CONFIG_SHELL='$(SHELL)' '$(SHELL)' "$$abs_srcdir/$(TESTSUITE)" \ |
| 60 | + CONFIG_SHELL=$(SHELL) $(SHELL) "$$abs_srcdir/$(TESTSUITE)" \ |
| 61 | $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) \ |
| 62 | -k interactive -k recursive INNER_TESTSUITEFLAGS=',interactive' \ |
| 63 | $(TESTSUITEFLAGS) |
| 64 | @@ -828,7 +828,7 @@ check-noninteractive: check-noninteracti |
| 65 | clean-local: |
| 66 | -$(CD_TESTDIR); \ |
| 67 | test -f "$$abs_srcdir/$(TESTSUITE)" && \ |
| 68 | - '$(SHELL)' "$$abs_srcdir/$(TESTSUITE)" --clean |
| 69 | + $(SHELL) "$$abs_srcdir/$(TESTSUITE)" --clean |
| 70 | |
| 71 | ## An empty target to depend on when a rule needs to always run |
| 72 | ## whenever it is visited. |