clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-09-07 22:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #402 from xrmx/ia64

Browse Source 
Ia64 fixes
This commit is contained in:
unbit
2013-09-30 08:31:03 -07:00
parent f0c8cbf190 4032efd3e8
commit 1036d9c18b
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/uwsgi.c
+2
View File
@@ -2419,9 +2419,11 @@ int uwsgi_start(void *v_argv) {
#ifdef __linux__
uwsgi_set_cgroup();
#if !defined(__ia64__)
if (uwsgi.ns) {
linux_namespace_jail();
}
#endif
#endif
uwsgi_hooks_run(uwsgi.hook_in_jail, "in-jail", 1);
uwsgi.h
+2
View File
@@ -3163,8 +3163,10 @@ int uwsgi_str3_num(char *);
int uwsgi_str4_num(char *);
#ifdef __linux__
#if !defined(__ia64__)
void linux_namespace_start(void *);
void linux_namespace_jail(void);
#endif
int uwsgi_netlink_veth(char *, char *);
int uwsgi_netlink_veth_attach(char *, pid_t);
int uwsgi_netlink_ifup(char *);
uwsgiconfig.py
+3 -2
View File
@@ -542,8 +542,9 @@ class uConf(object):
report['kernel'] = uwsgi_os
if uwsgi_os == 'Linux' and uwsgi_cpu != 'ia64':
self.gcc_list.append('lib/linux_ns')
if uwsgi_os == 'Linux':
if uwsgi_cpu != 'ia64':
self.gcc_list.append('lib/linux_ns')
try:
lk_ver = uwsgi_os_k.split('.')
if int(lk_ver[0]) <= 2 and int(lk_ver[1]) <= 6 and int(lk_ver[2]) <= 9: