From 2e539782f7cdc7b055998bf9d254555f9d2daefd Mon Sep 17 00:00:00 2001 From: Yuriy Vidineev Date: Tue, 21 Jul 2020 00:20:26 -0700 Subject: [PATCH] fix build with make 4.3 --- debian/changelog | 1 + debian/patches/rabbitmq-dist.mk.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 18 insertions(+) create mode 100644 debian/patches/rabbitmq-dist.mk.patch diff --git a/debian/changelog b/debian/changelog index 0194e90..6ae56c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ rabbitmq-server (3.8.5-1) unstable; urgency=medium version 23 (Closes: #964038). * Re-add debian/gbp.conf as the package is using pristine-tar. * Rebased lets-use-python3-not-python-binary.patch. + * Add rabbitmq-dist.mk.patch to fix build with make 4.3 (Closes: 964636) -- Thomas Goirand Fri, 10 Jul 2020 12:57:57 +0200 diff --git a/debian/patches/rabbitmq-dist.mk.patch b/debian/patches/rabbitmq-dist.mk.patch new file mode 100644 index 0000000..a563d3f --- /dev/null +++ b/debian/patches/rabbitmq-dist.mk.patch @@ -0,0 +1,16 @@ +make 4.3 compatibility change +Index: rabbit_salsa_my_new/deps/rabbit_common/mk/rabbitmq-dist.mk +=================================================================== +--- rabbit_salsa_my_new.orig/deps/rabbit_common/mk/rabbitmq-dist.mk ++++ rabbit_salsa_my_new/deps/rabbit_common/mk/rabbitmq-dist.mk +@@ -78,8 +78,8 @@ $$(dist_$(1)_ez): $$(if $$(wildcard $(3) + ifeq ($$(shell test -f $(3)/rabbitmq-components.mk \ + && grep -q '^list-dist-deps::' $(3)/Makefile && echo yes),yes) + $$(dist_$(1)_ez): $$(patsubst %,$(3)/%, \ +- $$(shell $(MAKE) --no-print-directory -C $(3) list-dist-deps \ +- APP=$(1) VSN=$(2) EZ_DIR=$$(abspath $$(dist_$(1)_ez_dir)))) ++ $$(shell env MAKEFLAGS=--no-print-directory $$(MAKE) -C $(3) list-dist-deps \ ++ APP=$(1) VSN=$(2) EZ_DIR=$$(abspath $$(dist_$(1)_ez_dir)) 2>/dev/null)) + endif + + ERLANGMK_DIST_APPS += $(1) diff --git a/debian/patches/series b/debian/patches/series index 8a99d51..fbc189a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ lets-use-python3-not-python-binary.patch +rabbitmq-dist.mk.patch -- GitLab