Use HiPE-compiled code

Closes-Bug: 1645315
Change-Id: I3b41147be55db2a76fa47688bd1ec416a0c6ef1d

diff --git a/debian/changelog b/debian/changelog
index 611939af45e944bed6ac527e9a75f25a4424d8f4..a3a23716042f494262eea7ee8a5b5bad0785fff8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (3.6.6-1~u14.04+mos2) mos7.0-hotfix; urgency=medium
+
+  * Use HiPE-compilation
+
+ -- Alexey Lebedeff <alebedev@mirantis.com>  Fri, 11 Nov 2016 15:06:56 +0000
+
 rabbitmq-server (3.6.6-1~u14.04+mos1) mos7.0-hotfix; urgency=medium
 
   * new upstream release

diff --git a/debian/control b/debian/control
index 9d89f21a4a047d0c9b46c6819bcd06c8fe2b1572..34e6bb47b857d6639e7da76b3dc836b474094650 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Standards-Version: 3.9.4
 
 Package: rabbitmq-server
 Architecture: all
-Depends: erlang-nox (>= 18.1) | esl-erlang, adduser, logrotate, socat, init-system-helpers (>= 1.13~)
+Depends: erlang-nox (>= 18.1) | esl-erlang, adduser, logrotate, socat, init-system-helpers (>= 1.13~), erlang-base-hipe
 Description: Multi-protocol messaging broker
  RabbitMQ is an open source multi-protocol messaging broker.
 Homepage: http://www.rabbitmq.com/

diff --git a/debian/patches/native-code-location.patch b/debian/patches/native-code-location.patch
new file mode 100644 (file)
index 0000000..d207454
--- /dev/null
+++ b/debian/patches/native-code-location.patch
@@ -0,0 +1,10 @@
+--- a/deps/rabbit/scripts/rabbitmq-server
++++ b/deps/rabbit/scripts/rabbitmq-server
+@@ -152,6 +152,7 @@ start_rabbitmq_server() {
+     check_start_params &&
+     RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
+     exec ${ERL_DIR}erl \
++        -pa /var/lib/rabbitmq/native-code \
+         -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \
+         ${RABBITMQ_START_RABBIT} \
+         ${RABBITMQ_NAME_TYPE} ${RABBITMQ_NODENAME} \

diff --git a/debian/patches/series b/debian/patches/series
index f99b7b1c21d3ef6d7f6f2667feedb3a7eb75af40..6dce3bfc469a1c34a7450e8708b5cf683fa3377f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 revert_private_attributes.patch
 policy_location.patch
+native-code-location.patch

diff --git a/debian/postinst b/debian/postinst
old mode 100644 (file)
new mode 100755 (executable)
index c83881e..cddeb99
--- a/debian/postinst
+++ b/debian/postinst
@@ -41,6 +41,7 @@ case "$1" in
            [ ! -f /etc/rabbitmq/rabbitmq-env.conf ]; then
             mv /etc/rabbitmq/rabbitmq.conf /etc/rabbitmq/rabbitmq-env.conf
         fi
+        rabbitmqctl hipe_compile /var/lib/rabbitmq/native-code
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)