More patches. If this works will send upstream
This commit is contained in:
parent
ce8a33b8c9
commit
2c1b7e4cb1
|
@ -16,6 +16,7 @@ Patch0: uwsgi_trick_chroot_rpmbuild.patch
|
||||||
Patch1: uwsgi_fix_rpath.patch
|
Patch1: uwsgi_fix_rpath.patch
|
||||||
Patch2: uwsgi_ruby20_compatibility.patch
|
Patch2: uwsgi_ruby20_compatibility.patch
|
||||||
Patch3: uwsgi_fix_lua.patch
|
Patch3: uwsgi_fix_lua.patch
|
||||||
|
Patch4: uwsgi_fix_jvm_in_arm.patch
|
||||||
BuildRequires: curl, python2-devel, libxml2-devel, libuuid-devel, jansson-devel
|
BuildRequires: curl, python2-devel, libxml2-devel, libuuid-devel, jansson-devel
|
||||||
BuildRequires: libyaml-devel, perl-devel, ruby-devel, perl-ExtUtils-Embed
|
BuildRequires: libyaml-devel, perl-devel, ruby-devel, perl-ExtUtils-Embed
|
||||||
BuildRequires: python3-devel, python-greenlet-devel, lua-devel, ruby, pcre-devel
|
BuildRequires: python3-devel, python-greenlet-devel, lua-devel, ruby, pcre-devel
|
||||||
|
@ -236,6 +237,7 @@ echo "plugin_dir = %{_libdir}/%{name}" >> buildconf/$(basename %{SOURCE1})
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --build fedora.ini
|
CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --build fedora.ini
|
||||||
|
@ -386,6 +388,7 @@ exit 0
|
||||||
- Copying the version changelog to top-level doc
|
- Copying the version changelog to top-level doc
|
||||||
- Compile with POSIX capabilities
|
- Compile with POSIX capabilities
|
||||||
- Embed the loggers into the binary itself, no need for an extra package
|
- Embed the loggers into the binary itself, no need for an extra package
|
||||||
|
- Patching jvm plugin to support arm
|
||||||
|
|
||||||
* Wed Oct 02 2013 Jorge A Gallegos <kad@fedoraproject.org> - 1.9.17-0
|
* Wed Oct 02 2013 Jorge A Gallegos <kad@fedoraproject.org> - 1.9.17-0
|
||||||
- Rebuilt for version 1.9.17
|
- Rebuilt for version 1.9.17
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
diff --git a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py
|
||||||
|
index ac7eb3e..3c0e097 100644
|
||||||
|
--- a/plugins/jvm/uwsgiplugin.py
|
||||||
|
+++ b/plugins/jvm/uwsgiplugin.py
|
||||||
|
@@ -7,12 +7,14 @@ JVM_INCPATH = None
|
||||||
|
JVM_LIBPATH = None
|
||||||
|
|
||||||
|
operating_system = os.uname()[0].lower()
|
||||||
|
-arch = os.uname()[4]
|
||||||
|
+arch = os.uname()[4].lower()
|
||||||
|
|
||||||
|
if arch in ('i686', 'x86', 'x86_32'):
|
||||||
|
arch = 'i386'
|
||||||
|
elif arch in ('x86_64',):
|
||||||
|
arch = 'amd64'
|
||||||
|
+elif arch.startswith('arm'):
|
||||||
|
+ arch = 'arm'
|
||||||
|
|
||||||
|
# try to detect the JVM
|
||||||
|
if operating_system == 'darwin':
|
Loading…
Reference in New Issue