summaryrefslogtreecommitdiffstats
path: root/testing/rabbitmq-server
diff options
context:
space:
mode:
authorBartłomiej Piotrowski <b@bpiotrowski.pl>2016-07-20 12:48:52 +0200
committerBartłomiej Piotrowski <b@bpiotrowski.pl>2016-07-20 12:49:50 +0200
commitcfeccceb2ef859702c9c89ec6a69a6ff4292b857 (patch)
treef95f0c49c407850cd2434466796eec9c1a75edb5 /testing/rabbitmq-server
parentfedb0bf4e720d95e6e55b2067b71f340782ad564 (diff)
testing/rabbitmq-server: fix build
Diffstat (limited to 'testing/rabbitmq-server')
-rw-r--r--testing/rabbitmq-server/APKBUILD10
-rw-r--r--testing/rabbitmq-server/grep.patch13
2 files changed, 20 insertions, 3 deletions
diff --git a/testing/rabbitmq-server/APKBUILD b/testing/rabbitmq-server/APKBUILD
index f05ee5f4cdb..db9910cd266 100644
--- a/testing/rabbitmq-server/APKBUILD
+++ b/testing/rabbitmq-server/APKBUILD
@@ -24,6 +24,7 @@ source="
rabbitmq-server.initd
rabbitmq-server.logrotate
https://github.com/rabbitmq/${pkgname}/releases/download/rabbitmq_v${_realver}/${pkgname}-${pkgver}.tar.xz
+ grep.patch
"
builddir="$srcdir/${pkgname}-${pkgver}"
@@ -80,10 +81,13 @@ package() {
md5sums="12287613dfb924d4cde19202de6eb313 rabbitmq-server.initd
f24af11867cddc5a17fefa8bf4276d52 rabbitmq-server.logrotate
-3568dceb7f120549fc0add9836b89659 rabbitmq-server-3.6.3.tar.xz"
+3568dceb7f120549fc0add9836b89659 rabbitmq-server-3.6.3.tar.xz
+9a1416ef9ce8ac9deaf494a1af951cdb grep.patch"
sha256sums="b1ffe4a47550474c7a5b8ab47f4cd40549b84ede361302fa58863f27f17be3ec rabbitmq-server.initd
9cce79e90835317b9704ecdf44e7dbc71803a17c85c1402f2bb4b2edb0232ab2 rabbitmq-server.logrotate
-053b22ab1cdfddf1d3975f16d22a182d0bab673ab1b4a88f7a390f0b2a47648f rabbitmq-server-3.6.3.tar.xz"
+053b22ab1cdfddf1d3975f16d22a182d0bab673ab1b4a88f7a390f0b2a47648f rabbitmq-server-3.6.3.tar.xz
+23f4cc625e9c4c937640eb5d6c91089c122299a8ee4cc4f7a2e040aeae269969 grep.patch"
sha512sums="a8bb02a7cae1f8720e5c7aaabfe6a2c0e731cffbe0d8f99bdcb6597daa654dc49e6d41943974601435700cf469eaa8286dc91a3255a6b9023754c3861fbb5cd9 rabbitmq-server.initd
b8655cb048ab3b32001d4e6920bb5366696f3a5da75c053605e9b270e771c548e36858dca8338813d34376534515bba00af5e6dd7b4b1754a0e64a8fb756e3f3 rabbitmq-server.logrotate
-a079701537686aba11fd2e0da5801848348a6d154414d006635005bf9e42d9b88e2d34d755a72eca43e2dc45fc83d8a37a99dd938f8f094424e65e77010cf91f rabbitmq-server-3.6.3.tar.xz"
+a079701537686aba11fd2e0da5801848348a6d154414d006635005bf9e42d9b88e2d34d755a72eca43e2dc45fc83d8a37a99dd938f8f094424e65e77010cf91f rabbitmq-server-3.6.3.tar.xz
+6bc2ebbaff9b0f3d82e9775453c5ffc66d0662566754aefab2b155e55d5615f29c484573dbc9f341590b9183c827663da1e6ddc122f2b721e4a9d91205441ac6 grep.patch"
diff --git a/testing/rabbitmq-server/grep.patch b/testing/rabbitmq-server/grep.patch
new file mode 100644
index 00000000000..43d12a8e2f6
--- /dev/null
+++ b/testing/rabbitmq-server/grep.patch
@@ -0,0 +1,13 @@
+diff --git a/erlang.mk b/erlang.mk
+index efbcf5c..65fb954 100644
+--- a/erlang.mk
++++ b/erlang.mk
+@@ -4991,7 +4991,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; \
+ fi