| author | Drew Fisher <drew.fisher@oracle.com> |
| Thu, 14 Apr 2016 14:58:30 -0700 | |
| changeset 5776 | f6fa335ae47b |
| parent 5405 | 66fd59fecd68 |
| permissions | -rw-r--r-- |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to use supported sed flags and to remove gzipping of man pages |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
2 |
|
|
5776
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
3 |
--- rabbitmq-server-3.6.1/Makefile.orig 2016-03-31 14:49:40.661997085 -0700 |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
4 |
+++ rabbitmq-server-3.6.1/Makefile 2016-03-31 14:55:24.094181414 -0700 |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
5 |
@@ -82,7 +82,7 @@ ifdef CREDIT_FLOW_TRACING |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
6 |
RMQ_ERLC_OPTS += -DCREDIT_FLOW_TRACING=true |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
7 |
endif |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
8 |
|
|
5776
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
9 |
-ERTS_VER := $(shell erl -version 2>&1 | sed -E 's/.* version //') |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
10 |
+ERTS_VER := $(shell erl -version 2>&1 | sed -e 's/.* version //') |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
11 |
USE_SPECS_MIN_ERTS_VER = 5.11 |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
12 |
ifeq ($(call compare_version,$(ERTS_VER),$(USE_SPECS_MIN_ERTS_VER),>=),true) |
|
5776
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
13 |
RMQ_ERLC_OPTS += -Duse_specs |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
14 |
@@ -391,8 +391,8 @@ install-man: manpages |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
15 |
for section in $$sections; do \ |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
16 |
mkdir -p $(DESTDIR)$(MANDIR)/man$$section; \ |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
17 |
for manpage in $(DOCS_DIR)/*.$$section; do \ |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
18 |
- gzip < $$manpage \ |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
19 |
- > $(DESTDIR)$(MANDIR)/man$$section/$$(basename $$manpage).gz; \ |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
20 |
+ cp $$manpage \ |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
21 |
+ $(DESTDIR)$(MANDIR)/man$$section/$$(basename $$manpage); \ |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
22 |
done; \ |
|
f6fa335ae47b
23034195 Update RabbitMQ to 3.6.1
Drew Fisher <drew.fisher@oracle.com>
parents:
5405
diff
changeset
|
23 |
done |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
24 |