From 6cc21f4b18e94588cbf329e34eab1ee81ff5c3e8 Mon Sep 17 00:00:00 2001 From: Nathan Johnson Date: Tue, 4 Oct 2016 10:17:09 -0500 Subject: testing/rabbitmq-server: update to 3.6.5 --- testing/rabbitmq-server/grep.patch | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'testing/rabbitmq-server/grep.patch') diff --git a/testing/rabbitmq-server/grep.patch b/testing/rabbitmq-server/grep.patch index 2a7f719542..d754cd35a1 100644 --- a/testing/rabbitmq-server/grep.patch +++ b/testing/rabbitmq-server/grep.patch @@ -33,19 +33,6 @@ index fc2d806..05952b2 100644 > ebin/$(PROJECT).app else - $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_amqp1_0/erlang.mk b/deps/rabbitmq_amqp1_0/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_amqp1_0/erlang.mk -+++ b/deps/rabbitmq_amqp1_0/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ + $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ exit 1; \ @@ -215,19 +202,6 @@ index 9f0c0c3..37f1700 100644 > ebin/$(PROJECT).app else - $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ -+ $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ - echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ - exit 1; \ - fi -diff --git a/deps/rabbitmq_shovel_management/erlang.mk b/deps/rabbitmq_shovel_management/erlang.mk -index 9f0c0c3..37f1700 100644 ---- a/deps/rabbitmq_shovel_management/erlang.mk -+++ b/deps/rabbitmq_shovel_management/erlang.mk -@@ -4977,7 +4977,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ - > ebin/$(PROJECT).app - else -- $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ + $(verbose) if [ -z "$$(grep -e '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ exit 1; \ -- cgit v1.2.3