[packages/hhvm/hhvm-3.2] - disable -werror for ocaml stuff - rel 8
baggins
baggins at pld-linux.org
Sun Nov 16 19:03:34 CET 2014
commit 7ab1ea45b110bd835b0a2d0dd545bbe1867fa1a8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Nov 16 19:03:12 2014 +0100
- disable -werror for ocaml stuff
- rel 8
hhvm.spec | 4 +++-
no-warn-err.patch | 11 +++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index 8a930bf..591fd9c 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -10,7 +10,7 @@
Summary: Virtual Machine, Runtime, and JIT for PHP
Name: hhvm
Version: 3.2.0
-Release: 7
+Release: 8
License: PHP 3.01
Group: Development/Languages
Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
@@ -27,6 +27,7 @@ Patch0: ccache.patch
Patch1: no-debug.patch
Patch2: hphpize.patch
Patch3: %{name}-build.patch
+Patch4: no-warn-err.patch
URL: https://github.com/facebook/hhvm/wiki
BuildRequires: ImageMagick-devel
BuildRequires: a52dec-libs-devel
@@ -224,6 +225,7 @@ mv folly-* third-party/folly/src
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# prefer ones from system
rm CMake/FindBISON.cmake
diff --git a/no-warn-err.patch b/no-warn-err.patch
new file mode 100644
index 0000000..9991f6b
--- /dev/null
+++ b/no-warn-err.patch
@@ -0,0 +1,11 @@
+--- hhvm-HHVM-3.2.0/hphp/hack/src/Makefile.common~ 2014-07-18 02:12:10.000000000 +0200
++++ hhvm-HHVM-3.2.0/hphp/hack/src/Makefile.common 2014-11-16 19:02:23.653327730 +0100
+@@ -29,7 +29,7 @@
+ # don't want to add an extra layer of complexity. In fact, we are not
+ # even sure it would work with -thread ...
+ OCAMLDTYPES?=-dtypes
+-OCAMLCFLAGS?=-g $(OCAMLDTYPES) $(OCAMLCFLAGS_EXTRA) -w -21 -warn-error +a
++OCAMLCFLAGS?=-g $(OCAMLDTYPES) $(OCAMLCFLAGS_EXTRA) -w -21 +a
+
+ # This flag is also used in subdirectories so don't change its name here.
+ OPTFLAGS?= $(OCAMLCFLAGS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/7ab1ea45b110bd835b0a2d0dd545bbe1867fa1a8
More information about the pld-cvs-commit
mailing list