Build against v8-314 on F25+ rhbz#1339293

This commit is contained in:
Carl George 2016-08-02 11:27:37 -05:00
parent 6e11853b72
commit 02995563d5
2 changed files with 25 additions and 2 deletions

View File

@ -115,7 +115,7 @@
Name: uwsgi
Version: %{majornumber}.%{minornumber}.%{releasenumber}
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Fast, self-healing, application container server
Group: System Environment/Daemons
License: GPLv2 with exceptions
@ -133,6 +133,7 @@ Patch2: uwsgi_ruby20_compatibility.patch
Patch3: uwsgi_fix_lua.patch
# https://github.com/unbit/uwsgi/issues/882
Patch5: uwsgi_fix_mongodb.patch
Patch6: uwsgi_v8-314_compatibility.patch
BuildRequires: curl, python2-devel, libxml2-devel, libuuid-devel, jansson-devel
BuildRequires: libyaml-devel, perl-devel, ruby-devel, perl-ExtUtils-Embed
%if %{with python3}
@ -169,8 +170,12 @@ BuildRequires: systemd-devel, systemd-units
BuildRequires: mono-devel, mono-web
%endif
%if %{with v8}
%if 0%{?fedora} >= 25
BuildRequires: v8-314-devel
%else
BuildRequires: v8-devel
%endif
%endif
%if %{with mongodblibs}
BuildRequires: libmongodb-devel
%endif
@ -828,7 +833,7 @@ This package contains the uGreen plugin for uWSGI
%package -n %{name}-plugin-v8
Summary: uWSGI - Plugin for v8 support
Group: System Environment/Daemons
Requires: %{name}-plugin-common, v8
Requires: %{name}-plugin-common
%description -n %{name}-plugin-v8
This package contains the v8 plugin for uWSGI
@ -1088,6 +1093,9 @@ echo "plugin_dir = %{_libdir}/%{name}" >> buildconf/$(basename %{SOURCE1})
%if 0%{?fedora} >= 22
%patch5 -p1
%endif
%if %{with v8} && 0%{?fedora} >= 25
%patch6 -p1
%endif
#disable plug-ins
%if %{without mongodblibs}
@ -1650,6 +1658,9 @@ fi
%changelog
* Mon Aug 01 2016 Carl George <carl.george@rackspace.com> - 2.0.13.1-2
- Build against v8-314 on F25+ rhbz#1339293
* Thu Jul 28 2016 Jorge A Gallegos <kad@blegh.net> - 2.0.13.1-1
- Bumped to latest stable

View File

@ -0,0 +1,12 @@
diff -Naurp a/plugins/v8/uwsgiplugin.py b/plugins/v8/uwsgiplugin.py
--- a/plugins/v8/uwsgiplugin.py 2016-05-12 12:37:49.000000000 -0500
+++ b/plugins/v8/uwsgiplugin.py 2016-08-01 22:56:50.969785338 -0500
@@ -1,7 +1,7 @@
import os
NAME='v8'
-CFLAGS = ['-Wno-deprecated-declarations']
+CFLAGS = ['-Wno-deprecated-declarations', '-I/usr/include/v8-3.14']
LDFLAGS = []
LIBS = ['-lstdc++', '-lv8']
engine = os.environ.get('UWSGICONFIG_V8_ENGINE', '')