diff options
| author | David Wragg <david@rabbitmq.com> | 2010-06-28 12:19:30 +0100 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2010-06-28 12:19:30 +0100 |
| commit | 91fcaa3520f00ba0ed3d3cea870b2c1f34cb496b (patch) | |
| tree | 21bbddaabb11e6ac210ddd169898325e10c6a665 | |
| parent | cdf6154e80ca17bfcbb290484cc496493b08829e (diff) | |
| download | rabbitmq-server-91fcaa3520f00ba0ed3d3cea870b2c1f34cb496b.tar.gz | |
Add the patch to get rabbitmq-server to build under R14A
| -rw-r--r-- | packaging/macports/Makefile | 1 | ||||
| -rw-r--r-- | packaging/macports/Portfile.in | 2 | ||||
| -rw-r--r-- | packaging/macports/erlang-r14a-build-fix.diff | 15 |
3 files changed, 18 insertions, 0 deletions
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile index 4ad4c30b..38099bdd 100644 --- a/packaging/macports/Makefile +++ b/packaging/macports/Makefile @@ -35,6 +35,7 @@ macports: dirs $(DEST)/Portfile for f in rabbitmq-asroot-script-wrapper rabbitmq-script-wrapper ; do \ cp $(COMMON_DIR)/$$f $(DEST)/files ; \ done + cp erlang-r14a-build-fix.diff $(DEST)/files sed -i -e 's|@SU_RABBITMQ_SH_C@|SHELL=/bin/sh su -m rabbitmq -c|' \ $(DEST)/files/rabbitmq-script-wrapper cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in index b0158ab0..35e438d9 100644 --- a/packaging/macports/Portfile.in +++ b/packaging/macports/Portfile.in @@ -4,6 +4,7 @@ PortSystem 1.0 name rabbitmq-server version @VERSION@ +revision 2 categories net maintainers paperplanes.de:meyer rabbitmq.com:tonyg openmaintainer platforms darwin @@ -21,6 +22,7 @@ checksums \ md5 @md5@ \ sha1 @sha1@ \ rmd160 @rmd160@ +patchfiles erlang-r14a-build-fix.diff depends_build port:erlang port:xmlto port:libxslt depends_run port:erlang diff --git a/packaging/macports/erlang-r14a-build-fix.diff b/packaging/macports/erlang-r14a-build-fix.diff new file mode 100644 index 00000000..bf61cac3 --- /dev/null +++ b/packaging/macports/erlang-r14a-build-fix.diff @@ -0,0 +1,15 @@ +fix syntax error that prevented compilation under Erlang/OTP R14A + +diff --git src/rabbit_exchange.erl.orig src/rabbit_exchange.erl +--- src/rabbit_exchange.erl.orig ++++ src/rabbit_exchange.erl +@@ -100,7 +100,7 @@ + + %%---------------------------------------------------------------------------- + +--define(INFO_KEYS, [name, type, durable, auto_delete, arguments]. ++-define(INFO_KEYS, [name, type, durable, auto_delete, arguments]). + + recover() -> + Exs = rabbit_misc:table_fold( + |