fix build with make 4.3
Yuriy Vidineev
3 years ago
| 4 | 4 | version 23 (Closes: #964038). |
| 5 | 5 | * Re-add debian/gbp.conf as the package is using pristine-tar. |
| 6 | 6 | * Rebased lets-use-python3-not-python-binary.patch. |
| 7 | * Add rabbitmq-dist.mk.patch to fix build with make 4.3 (Closes: 964636) | |
| 7 | 8 | |
| 8 | 9 | -- Thomas Goirand <zigo@debian.org> Fri, 10 Jul 2020 12:57:57 +0200 |
| 9 | 10 |
| 0 | make 4.3 compatibility change | |
| 1 | Index: rabbit_salsa_my_new/deps/rabbit_common/mk/rabbitmq-dist.mk | |
| 2 | =================================================================== | |
| 3 | --- rabbit_salsa_my_new.orig/deps/rabbit_common/mk/rabbitmq-dist.mk | |
| 4 | +++ rabbit_salsa_my_new/deps/rabbit_common/mk/rabbitmq-dist.mk | |
| 5 | @@ -78,8 +78,8 @@ $$(dist_$(1)_ez): $$(if $$(wildcard $(3) | |
| 6 | ifeq ($$(shell test -f $(3)/rabbitmq-components.mk \ | |
| 7 | && grep -q '^list-dist-deps::' $(3)/Makefile && echo yes),yes) | |
| 8 | $$(dist_$(1)_ez): $$(patsubst %,$(3)/%, \ | |
| 9 | - $$(shell $(MAKE) --no-print-directory -C $(3) list-dist-deps \ | |
| 10 | - APP=$(1) VSN=$(2) EZ_DIR=$$(abspath $$(dist_$(1)_ez_dir)))) | |
| 11 | + $$(shell env MAKEFLAGS=--no-print-directory $$(MAKE) -C $(3) list-dist-deps \ | |
| 12 | + APP=$(1) VSN=$(2) EZ_DIR=$$(abspath $$(dist_$(1)_ez_dir)) 2>/dev/null)) | |
| 13 | endif | |
| 14 | ||
| 15 | ERLANGMK_DIST_APPS += $(1) |