diff options
| author | dumbbell <dumbbell@FreeBSD.org> | 2018-08-06 16:18:10 +0800 |
|---|---|---|
| committer | dumbbell <dumbbell@FreeBSD.org> | 2018-08-06 16:18:10 +0800 |
| commit | 3a512f950908e8418fd743d9257226e4b60c5973 (patch) | |
| tree | b8dbb4450c50e0f1223fde6a20125ec882d0ab13 | |
| parent | 518c0a8cdad42a755a673fd0ce9ffec6e05185ba (diff) | |
| download | freebsd-ports-gnome-3a512f950908e8418fd743d9257226e4b60c5973.tar.gz freebsd-ports-gnome-3a512f950908e8418fd743d9257226e4b60c5973.tar.zst freebsd-ports-gnome-3a512f950908e8418fd743d9257226e4b60c5973.zip | |
net/rabbitmq: Fix build with Elixir 1.7.x
Patches were backported from the upcoming RabbitMQ 3.7.8.
Obtained from: https://github.com/rabbitmq/rabbitmq-cli/tree/v3.7.x
Sponsored by: Pivotal Software, Inc.
| -rw-r--r-- | net/rabbitmq/Makefile | 1 | ||||
| -rw-r--r-- | net/rabbitmq/files/patch-deps_rabbitmq__cli_lib_rabbitmq_cli_core_parser.ex | 26 | ||||
| -rw-r--r-- | net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs | 13 |
3 files changed, 40 insertions, 0 deletions
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index cd22a360664b..a7ab9520090c 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -3,6 +3,7 @@ PORTNAME= rabbitmq PORTVERSION= 3.7.7 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} diff --git a/net/rabbitmq/files/patch-deps_rabbitmq__cli_lib_rabbitmq_cli_core_parser.ex b/net/rabbitmq/files/patch-deps_rabbitmq__cli_lib_rabbitmq_cli_core_parser.ex new file mode 100644 index 000000000000..3ef7c4c3fed7 --- /dev/null +++ b/net/rabbitmq/files/patch-deps_rabbitmq__cli_lib_rabbitmq_cli_core_parser.ex @@ -0,0 +1,26 @@ +--- deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex.orig 2018-06-14 08:10:14 UTC ++++ deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex +@@ -142,7 +142,12 @@ defmodule RabbitMQ.CLI.Core.Parser do + switches = default_switches() + aliases = default_aliases() + {options, tail, invalid} = +- OptionParser.parse_head(input, strict: switches, aliases: aliases) ++ OptionParser.parse_head( ++ input, ++ strict: switches, ++ aliases: aliases, ++ allow_nonexistent_atoms: true, ++ ) + norm_options = normalize_options(options, switches) |> Map.new + {norm_options, tail, invalid} + end +@@ -157,7 +162,8 @@ defmodule RabbitMQ.CLI.Core.Parser do + {options, args, invalid} = OptionParser.parse( + input, + strict: switches, +- aliases: aliases ++ aliases: aliases, ++ allow_nonexistent_atoms: true, + ) + norm_options = normalize_options(options, switches) |> Map.new + {args, norm_options, invalid} diff --git a/net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs b/net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs new file mode 100644 index 000000000000..8066eab23b21 --- /dev/null +++ b/net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs @@ -0,0 +1,13 @@ +--- deps/rabbitmq_cli/mix.exs.orig 2018-06-14 08:10:14 UTC ++++ deps/rabbitmq_cli/mix.exs +@@ -19,8 +19,8 @@ defmodule RabbitMQCtl.MixfileBase do + def project do + [ + app: :rabbitmqctl, +- version: "3.7.5", +- elixir: "~> 1.6.0", ++ version: "3.7.8", ++ elixir: ">= 1.6.6 and < 1.8.0", + build_embedded: Mix.env == :prod, + start_permanent: Mix.env == :prod, + escript: [main_module: RabbitMQCtl, |