riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16775 from chrysn-pull-requests/shell-make-fixes

Browse Source 
makefiles: Sort >/dev/null and 2>&1
This commit is contained in:
chrysn 2021-08-27 10:37:51 +02:00 committed by GitHub
commit de768b5d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.include
View File

@ -327,12 +327,12 @@ APPLICATION := $(strip $(APPLICATION))
ifeq (,$(and $(DOWNLOAD_TO_STDOUT),$(DOWNLOAD_TO_FILE))) ifeq (,$(and $(DOWNLOAD_TO_STDOUT),$(DOWNLOAD_TO_FILE)))
ifeq (,$(WGET)) ifeq (,$(WGET))
ifeq (0,$(shell which wget 2>&1 > /dev/null ; echo $$?)) ifeq (0,$(shell which wget > /dev/null 2>&1 ; echo $$?))
WGET := $(shell which wget) WGET := $(shell which wget)
endif endif
endif endif
ifeq (,$(CURL)) ifeq (,$(CURL))
ifeq (0,$(shell which curl 2>&1 > /dev/null ; echo $$?)) ifeq (0,$(shell which curl > /dev/null 2>&1 ; echo $$?))
CURL := $(shell which curl) CURL := $(shell which curl)
endif endif
endif endif
@ -349,10 +349,10 @@ ifeq (,$(and $(DOWNLOAD_TO_STDOUT),$(DOWNLOAD_TO_FILE)))
endif endif
ifeq (,$(UNZIP_HERE)) ifeq (,$(UNZIP_HERE))
ifeq (0,$(shell which unzip 2>&1 > /dev/null ; echo $$?)) ifeq (0,$(shell which unzip > /dev/null 2>&1 ; echo $$?))
UNZIP_HERE := $(shell which unzip) -q UNZIP_HERE := $(shell which unzip) -q
else else
ifeq (0,$(shell which 7z 2>&1 > /dev/null ; echo $$?)) ifeq (0,$(shell which 7z > /dev/null 2>&1 ; echo $$?))
UNZIP_HERE := $(shell which 7z) x -bd UNZIP_HERE := $(shell which 7z) x -bd
else else
$(error Neither unzip nor 7z is installed.) $(error Neither unzip nor 7z is installed.)
@ -714,7 +714,7 @@ endef
# This is not the case on MacOSX, so it must be built on the fly # This is not the case on MacOSX, so it must be built on the fly
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
ifneq (,$(filter debug, $(MAKECMDGOALS))) ifneq (,$(filter debug, $(MAKECMDGOALS)))
ifneq (0,$(shell command -v setsid 2>&1 > /dev/null ; echo $$?)) ifneq (0,$(shell command -v setsid > /dev/null 2>&1 ; echo $$?))
SETSID = $(RIOTTOOLS)/setsid/setsid SETSID = $(RIOTTOOLS)/setsid/setsid
$(call target-export-variables,debug,$(SETSID)) $(call target-export-variables,debug,$(SETSID))
DEBUGDEPS += $(SETSID) DEBUGDEPS += $(SETSID)

2
makefiles/tools/gdb.inc.mk
View File

@ -1,5 +1,5 @@
# new versions of gdb will support all architectures in one binary # new versions of gdb will support all architectures in one binary
ifeq ($(shell gdb-multiarch -v 2>&1 > /dev/null; echo $$?),0) ifeq ($(shell gdb-multiarch -v > /dev/null 2>&1; echo $$?),0)
export GDB ?= gdb-multiarch export GDB ?= gdb-multiarch
else else
export GDBPREFIX ?= $(PREFIX) export GDBPREFIX ?= $(PREFIX)

2
makefiles/tools/riotgen.inc.mk
View File

@ -3,7 +3,7 @@
-include makefiles/color.inc.mk -include makefiles/color.inc.mk
riotgen-installed: riotgen-installed:
@command -v riotgen 2>&1 > /dev/null || \ @command -v riotgen > /dev/null 2>&1 || \
{ $(COLOR_ECHO) \ { $(COLOR_ECHO) \
"$(COLOR_RED)'riotgen' command is not available \ "$(COLOR_RED)'riotgen' command is not available \
please consider installing it from \ please consider installing it from \

2
pkg/flatbuffers/Makefile.include
View File

@ -2,7 +2,7 @@ INCLUDES += -I$(PKGDIRBASE)/flatbuffers/include
FLATC ?= flatc FLATC ?= flatc
ifneq (0,$(shell which flatc 2>&1 > /dev/null ; echo $$?)) ifneq (0,$(shell which flatc > /dev/null 2>&1 ; echo $$?))
FLATC = $(RIOTTOOLS)/flatc/flatc FLATC = $(RIOTTOOLS)/flatc/flatc
$(call target-export-variables,all,FLATC) $(call target-export-variables,all,FLATC)
endif endif