aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-06-16 19:27:11 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-06-16 19:27:11 +0300
commitaa8d48bdb8954179519f5b0ce5cafe2b5400e163 (patch)
tree928d549a50e6ba6d952fe01e7afe078c03c09cd5
parent41e89c5cb57805d1e9b7fa84169d3411efa8c692 (diff)
downloadmeson-aa8d48bdb8954179519f5b0ce5cafe2b5400e163.zip
meson-aa8d48bdb8954179519f5b0ce5cafe2b5400e163.tar.gz
meson-aa8d48bdb8954179519f5b0ce5cafe2b5400e163.tar.bz2
Added hack to clear out text seeping in from the surrounding Make when building a Debian package.
-rw-r--r--dependencies.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/dependencies.py b/dependencies.py
index 9ed8dee..c5c755f 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -428,9 +428,16 @@ class GnuStepDependency(Dependency):
liberr = liberr.decode()
if fp.returncode != 0:
raise DependencyException('Error getting objc-lib flags: %s %s' % (libtxt, liberr))
- self.libs = libtxt.split()
+ self.libs = self.weird_filter(libtxt.split())
print('Dependency GnuStep found: YES')
+ def weird_filter(self, elems):
+ """When building packages, the output of the enclosing Make
+is sometimes mixed among the subprocess output. I have no idea
+why. As a hack filter out everything that is not a flag."""
+ return [e for e in elems if e.startswith('-')]
+
+
def filter_flags(self, flags):
"""gnustep-config returns a bunch of garbage flags such
as -O2 and so on. Drop everything that is not needed."""