[arch-commits] Commit in hhvm/trunk (PKGBUILD hhvm-max.patch)

[Massimiliano Torromeo]

    Date: Friday, January 23, 2015 @ 10:05:42
  Author: mtorromeo
Revision: 126445

Removed patches and cmake declarations which are not needed anymore

Modified:
  hhvm/trunk/PKGBUILD
Deleted:
  hhvm/trunk/hhvm-max.patch

----------------+
 PKGBUILD       |   11 +----------
 hhvm-max.patch |   30 ------------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-23 08:52:50 UTC (rev 126444)
+++ PKGBUILD	2015-01-23 09:05:42 UTC (rev 126445)
@@ -22,7 +22,6 @@
         "folly-$_folly_commit.tar.gz::https://github.com/facebook/folly/archive/$_folly_commit.tar.gz"
         "thrift-$_thrift_commit.tar.gz::https://github.com/facebook/fbthrift/archive/$_thrift_commit.tar.gz"
         "proxygen-$_proxygen_commit.tar.gz::https://github.com/facebook/proxygen/archive/$_proxygen_commit.tar.gz"
-        'hhvm-max.patch'
         'hhvm.tmpfile'
         'hhvm.service'
         'hhvm at .service'
@@ -34,14 +33,10 @@
 
 prepare() {
     cd "$srcdir"/$pkgname-HHVM-$pkgver
-    patch -p1 -i "$srcdir"/hhvm-max.patch
 
     rm -rf third-party
     ln -s "$srcdir"/hhvm-third-party-$_thirdparty_commit third-party
 
-    # no bundled pcre
-    sed '/pcre/d' -i third-party/CMakeLists.txt
-
     cd third-party/folly
     rm -rf src
     ln -s "$srcdir"/folly-$_folly_commit src
@@ -59,12 +54,9 @@
     cd "$srcdir"/$pkgname-HHVM-$pkgver
     msg2 "Building hhvm"
 
-    # comment for tests
-    HPHP_NOTEST=1 \
-    cmake \
+    cmake -Wno-dev \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_PREFIX_PATH="$srcdir" \
-        -DFREETYPE_INCLUDE_DIRS:PATH=/usr/include/freetype2 \
         .
 
     make
@@ -105,7 +97,6 @@
             '00922bf8128f368fa8b3a1b0ab6d79086a77a9f95484bf020d0f06bcd4710441'
             'b5338bb0299651ccffef826348a50618c92980e619dbc9eb34f16c9ff4a6765a'
             '34fbb931fe112dca460f765d2552241914dcc229de72918c81af9787c3276d56'
-            'ab98d74c382f503f1208407e891d26a88f9314fa2b631f6ec2a4a73ead644ba2'
             'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc'
             '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
             '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'

Deleted: hhvm-max.patch
===================================================================
--- hhvm-max.patch	2015-01-23 08:52:50 UTC (rev 126444)
+++ hhvm-max.patch	2015-01-23 09:05:42 UTC (rev 126445)
@@ -1,30 +0,0 @@
-diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp
-index ba33bbd..38fe9ed 100644
---- a/hphp/compiler/analysis/emitter.cpp
-+++ b/hphp/compiler/analysis/emitter.cpp
-@@ -124,6 +124,10 @@ namespace HPHP {
- namespace Compiler {
- ///////////////////////////////////////////////////////////////////////////////
- 
-+#ifndef MAX
-+#define MAX(a,b) ((a)<(b)?(b):(a))
-+#endif
-+
- TRACE_SET_MOD(emitter)
- 
- using uchar = unsigned char;
-diff --git a/hphp/runtime/base/zend-pack.cpp b/hphp/runtime/base/zend-pack.cpp
-index d878ea4..01034c2 100644
---- a/hphp/runtime/base/zend-pack.cpp
-+++ b/hphp/runtime/base/zend-pack.cpp
-@@ -23,6 +23,10 @@
- 
- namespace HPHP {
- 
-+#ifndef MAX
-+#define MAX(a,b) ((a)<(b)?(b):(a))
-+#endif
-+
- #define INC_OUTPUTPOS(a,b)                                              \
-   if ((a) < 0 || ((INT_MAX - outputpos)/((int)b)) < (a)) {              \
-     throw_invalid_argument                                              \