Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Modify build files for 3.6.0
......................................................................


Modify build files for 3.6.0

Change-Id: Id99227d068ac2016b6a3371732b09683282934be
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 7 insertions(+), 2 deletions(-)



diff --git a/debian/changelog b/debian/changelog
index 2a9f9a3..16d7bc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hhvm (3.6.0+dfsg1-1+wm1) UNRELEASED; urgency=medium
+hhvm (3.6.0+dfsg1-1+wm1) trusty-wikimedia; urgency=medium
 
   * New upstream release
   * Added WMF patch to support streaming output in FastCGI 
diff --git a/debian/control b/debian/control
index b9139fc..f15e740 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@
   cmake,
   flex,
   libboost-dev,
+  libboost-context-dev,
   libboost-filesystem-dev,
   libboost-program-options-dev,
 # Only for third-party/folly.
@@ -31,6 +32,7 @@
   libevent-dev,
   libexpat1-dev,
   libfreetype6-dev,
+  libgmp-dev,
   libgoogle-glog-dev,
   libiberty-dev,
   libiconv-hook-dev,
@@ -49,6 +51,7 @@
   libonig-dev,
   libpcre3-dev,
   libpng12-dev,
+  libre2-dev,
   libsqlite3-dev,
   libssl-dev,
   libtbb-dev,
diff --git a/debian/rules b/debian/rules
index 786819a..2648248 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,9 @@
        dh_auto_configure -- \
                -DUSE_JSONC=ON \
                -DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2/ \
-               -DHOTPROFILER=ON \
+               -DENABLE_ASYNC_MYSQL=OFF \
+               -DENABLE_MCROUTER=OFF \
+               -DENABLE_SSP=ON \
                -DCMAKE_INSTALL_PREFIX=/usr \
                -DCMAKE_BUILD_TYPE=RelWithDebInfo
 

-- 
To view, visit https://gerrit.wikimedia.org/r/198211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id99227d068ac2016b6a3371732b09683282934be
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/hhvm
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to