diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2011-01-12 07:23:56 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2011-01-12 07:23:56 +0000 |
| commit | 190d07db8751eadf3e817aed6206b092ae57ecba (patch) | |
| tree | 55569343d7a7f5a5c17db2a9311f3a457eb44162 /www-servers/uwsgi/files | |
| parent | Removed old (diff) | |
| download | gentoo-2-190d07db8751eadf3e817aed6206b092ae57ecba.tar.gz gentoo-2-190d07db8751eadf3e817aed6206b092ae57ecba.tar.bz2 gentoo-2-190d07db8751eadf3e817aed6206b092ae57ecba.zip | |
Updated patch to use 'gcc -dumpversion' instead of 'gcc -v'.
(Portage version: 2.1.9.30/cvs/Linux x86_64)
Diffstat (limited to 'www-servers/uwsgi/files')
| -rw-r--r-- | www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch b/www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch index ae196b1f67e9..98298a6b50e1 100644 --- a/www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch +++ b/www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch @@ -1,13 +1,23 @@ diff --git a/uwsgiconfig.py b/uwsgiconfig.py -index c06882c..2efc46c 100644 +index 5025b51..d817ae1 100644 --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -84,7 +84,7 @@ def spcall2(cmd): +@@ -75,17 +75,7 @@ def spcall(cmd): else: return None +-def spcall2(cmd): +- p = subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE) +- +- if p.wait() == 0: +- if sys.version_info[0] > 2: +- return p.stderr.read().rstrip().decode() +- return p.stderr.read().rstrip() +- else: +- return None +- -gcc_version = str(spcall2("%s -v" % GCC)).split('\n')[-1].split()[2] -+gcc_version = str(spcall2("%s -v" % GCC)).split('\n')[-1].split()[4] ++gcc_version = str(spcall("%s -dumpversion" % GCC)) gcc_major = int(gcc_version.split('.')[0]) gcc_minor = int(gcc_version.split('.')[1]) |