Fix EL7 ppc64le build (remove the patch that breaks it)

This commit is contained in:
Ville Skyttä 2015-12-11 17:54:49 +02:00
parent d147c00576
commit c9e99425f8
2 changed files with 1 additions and 17 deletions

View File

@ -1,12 +0,0 @@
diff -up uwsgi-2.0.9/plugins/jvm/uwsgiplugin.py.ppc64le uwsgi-2.0.9/plugins/jvm/uwsgiplugin.py
--- uwsgi-2.0.9/plugins/jvm/uwsgiplugin.py.ppc64le 2015-04-14 13:18:25.042451636 +0200
+++ uwsgi-2.0.9/plugins/jvm/uwsgiplugin.py 2015-04-14 13:18:57.590565389 +0200
@@ -19,6 +19,8 @@ elif arch in ('x86_64',):
arch = 'amd64'
elif arch.startswith('arm'):
arch = 'arm'
+elif arch in ('ppc64le',):
+ arch = 'ppc64'
# try to detect the JVM
if operating_system == 'darwin':

View File

@ -133,8 +133,6 @@ Patch2: uwsgi_ruby20_compatibility.patch
Patch3: uwsgi_fix_lua.patch
# https://github.com/unbit/uwsgi/issues/882
Patch5: uwsgi_fix_mongodb.patch
# Fix java/jvm include path on ppc64le
Patch6: uwsgi-ppc64le-java.patch
BuildRequires: curl, python2-devel, libxml2-devel, libuuid-devel, jansson-devel
BuildRequires: libyaml-devel, perl-devel, ruby-devel, perl-ExtUtils-Embed
%if %{with python3}
@ -1086,9 +1084,6 @@ echo "plugin_dir = %{_libdir}/%{name}" >> buildconf/$(basename %{SOURCE1})
%if 0%{?fedora} >= 22
%patch5 -p1
%endif
%if 0%{?rhel} >= 7
%patch6 -p1 -b .ppc64le
%endif
#disable plug-ins
%if %{without mongodblibs}
@ -1654,6 +1649,7 @@ fi
%changelog
* Fri Dec 11 2015 Ville Skyttä <ville.skytta@iki.fi> - 2.0.11.2-7
- Don't build tornado3 for EL7 (no python3-tornado available yet)
- Fix EL7 ppc64le build
* Sun Dec 6 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.0.11.2-6
- Fixing glusterfs for non x86_64 on el7