Add patch7 to add glib-2.0 pkg-config flags to mono build
This commit is contained in:
parent
7240cd33d4
commit
3f332717e0
@ -136,6 +136,7 @@ Patch3: uwsgi_fix_lua.patch
|
|||||||
# https://github.com/unbit/uwsgi/issues/882
|
# https://github.com/unbit/uwsgi/issues/882
|
||||||
Patch5: uwsgi_fix_mongodb.patch
|
Patch5: uwsgi_fix_mongodb.patch
|
||||||
Patch6: uwsgi_v8-314_compatibility.patch
|
Patch6: uwsgi_v8-314_compatibility.patch
|
||||||
|
Patch7: uwsgi_fix_mono.patch
|
||||||
BuildRequires: curl, python2-devel, libxml2-devel, libuuid-devel, jansson-devel
|
BuildRequires: curl, python2-devel, libxml2-devel, libuuid-devel, jansson-devel
|
||||||
BuildRequires: libyaml-devel, ruby-devel
|
BuildRequires: libyaml-devel, ruby-devel
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
@ -184,7 +185,7 @@ BuildRequires: libgo-devel, gcc-go
|
|||||||
BuildRequires: systemd-devel, systemd-units
|
BuildRequires: systemd-devel, systemd-units
|
||||||
%endif
|
%endif
|
||||||
%if %{with mono}
|
%if %{with mono}
|
||||||
BuildRequires: mono-devel, mono-web
|
BuildRequires: mono-devel, mono-web, glib2-devel
|
||||||
%endif
|
%endif
|
||||||
%if %{with v8}
|
%if %{with v8}
|
||||||
%if 0%{?fedora} >= 25
|
%if 0%{?fedora} >= 25
|
||||||
@ -1121,6 +1122,9 @@ echo "plugin_dir = %{_libdir}/%{name}" >> buildconf/$(basename %{SOURCE1})
|
|||||||
%if %{with v8} && 0%{?fedora} >= 25
|
%if %{with v8} && 0%{?fedora} >= 25
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with mono}
|
||||||
|
%patch7 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
#disable plug-ins
|
#disable plug-ins
|
||||||
%if %{without mongodblibs}
|
%if %{without mongodblibs}
|
||||||
@ -1688,6 +1692,8 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
- Add patch7 to add glib-2.0 pkg-config flags to mono build
|
||||||
|
|
||||||
* Wed Feb 15 2017 Igor Gnatenko <ignatenko@redhat.com> - 2.0.14-10
|
* Wed Feb 15 2017 Igor Gnatenko <ignatenko@redhat.com> - 2.0.14-10
|
||||||
- Rebuild for brp-python-bytecompile
|
- Rebuild for brp-python-bytecompile
|
||||||
|
|
||||||
|
15
uwsgi_fix_mono.patch
Normal file
15
uwsgi_fix_mono.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff -Naurp a/plugins/mono/uwsgiplugin.py b/plugins/mono/uwsgiplugin.py
|
||||||
|
--- a/plugins/mono/uwsgiplugin.py 2016-10-03 03:16:59.000000000 -0500
|
||||||
|
+++ b/plugins/mono/uwsgiplugin.py 2017-03-20 16:18:54.917935286 -0500
|
||||||
|
@@ -1,9 +1,9 @@
|
||||||
|
import os
|
||||||
|
NAME='mono'
|
||||||
|
|
||||||
|
-CFLAGS = os.popen('pkg-config --cflags mono-2').read().rstrip().split()
|
||||||
|
+CFLAGS = os.popen('pkg-config --cflags mono-2 glib-2.0').read().rstrip().split()
|
||||||
|
LDFLAGS = []
|
||||||
|
-LIBS = os.popen('pkg-config --libs mono-2').read().rstrip().split()
|
||||||
|
+LIBS = os.popen('pkg-config --libs mono-2 glib-2.0').read().rstrip().split()
|
||||||
|
GCC_LIST = ['mono_plugin']
|
||||||
|
|
||||||
|
if os.uname()[0] == 'Darwin':
|
Loading…
Reference in New Issue
Block a user