[packages/xpra] handle $CC with spaces
glen
glen at pld-linux.org
Mon Dec 30 21:33:16 CET 2013
commit ee1187c797a824acb691be4e0c9497ec6eea7a72
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Dec 30 22:32:48 2013 +0200
handle $CC with spaces
setup-cc-ccache.patch | 15 +++++++++++++++
xpra.spec | 2 ++
2 files changed, 17 insertions(+)
---
diff --git a/xpra.spec b/xpra.spec
index 7de9132..aa3a285 100644
--- a/xpra.spec
+++ b/xpra.spec
@@ -23,6 +23,7 @@ License: GPL v2+
Group: X11/Applications/Networking
Source0: http://xpra.org/src/%{name}-%{version}.tar.xz
# Source0-md5: deb60252055062214f558155efc3714a
+Patch0: setup-cc-ccache.patch
URL: http://xpra.org/
BuildRequires: OpenGL-devel
BuildRequires: ffmpeg-devel
@@ -75,6 +76,7 @@ W uproszczeniu xpra to "screen" dla zdalnych aplikacji X-owych.
%prep
%setup -q
+%patch0 -p1
%build
CC="%{__cc}" \
diff --git a/setup-cc-ccache.patch b/setup-cc-ccache.patch
new file mode 100644
index 0000000..7c9c0df
--- /dev/null
+++ b/setup-cc-ccache.patch
@@ -0,0 +1,15 @@
+allow spaces in $CC env
+
+inspired from https://codereview.chromium.org/14813020/
+--- xpra-0.10.10/setup.py~ 2013-12-19 11:14:12.000000000 +0200
++++ xpra-0.10.10/setup.py 2013-12-30 20:14:28.220987556 +0200
+@@ -284,7 +284,8 @@
+ def get_gcc_version():
+ global GCC_VERSION
+ if len(GCC_VERSION)==0:
+- cmd = [os.environ.get("CC", "gcc"), "-v"]
++ cc = os.environ.get('CC', 'gcc').split()
++ cmd = cc + ['-v']
+ proc = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ output, _ = proc.communicate()
+ status = proc.wait()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xpra.git/commitdiff/ee1187c797a824acb691be4e0c9497ec6eea7a72
More information about the pld-cvs-commit
mailing list