Add RABBITMQ_CLIENT_PATCH to make upstream amqp_client work

While this is not quite "just work" due to other packages
depending on a forked off rabbitmq, this is still pretty
good as it actually makes it work and still leaves a choice
between upstream and the fork.

Hopefully people will start to use upstream but you know how
these things tend to go.

core/deps.mk

@@ -528,7 +528,13 @@ endif
 		cd $(DEPS_DIR)/$(1) && ./configure; \
 	fi
 ifeq ($(filter $(1),$(NO_AUTOPATCH)),)
-	@$(call dep_autopatch,$(1))
+	@if [ "$(RABBITMQ_CLIENT_PATCH)" ]; then \
+		echo " PATCH  Downloading extra RabbitMQ repositories..."; \
+		git clone https://github.com/rabbitmq/rabbitmq-codegen.git $(DEPS_DIR)/rabbitmq-codegen; \
+		git clone https://github.com/rabbitmq/rabbitmq-server.git $(DEPS_DIR)/rabbitmq-server; \
+	else \
+		$(call dep_autopatch,$(1)) \
+	fi
 endif
 endef
 

test/Makefile

@@ -234,7 +234,15 @@ pkg-$(1): pkg-$(1)-clean pkg-$(1)-app1
 		> app1/Makefile
 	cp ../packages.v2.tsv app1/.erlang.mk.packages.v2
 	$t \
-	$(MAKE) -C app1; if [ $$$$? -ne 0 ]; then \
+	if [ "$(1)" = "amqp_client" ]; then \
+		virtualenv -p /usr/bin/python2.7 --distribute temp-python; \
+		source temp-python/bin/activate; \
+		$(MAKE) -C app1 RABBITMQ_CLIENT_PATCH=1; \
+		deactivate; \
+	else \
+		$(MAKE) -C app1; \
+	fi; \
+	if [ $$$$? -ne 0 ]; then \
 		echo "$(1): make error" >> pkgs.log; \
 	else \
 		$(MAKE) -C app1; if [ $$$$? -ne 0 ]; then \