]>
Commit | Line | Data |
---|---|---|
883c26f3 MT |
1 | From 0796c0530648ae0e741a20a78d1fcf315783c178 Mon Sep 17 00:00:00 2001 |
2 | From: Kamil Dudka <kdudka@redhat.com> | |
3 | Date: Mon, 25 Feb 2013 19:48:22 +0100 | |
4 | Subject: [PATCH 1/2] setup.py: do not use curl-config --static-libs | |
5 | ||
6 | --- | |
7 | setup.py | 5 ++--- | |
8 | 1 files changed, 2 insertions(+), 3 deletions(-) | |
9 | ||
10 | diff --git a/setup.py b/setup.py | |
11 | index 76b9d58..86a2951 100644 | |
12 | --- a/setup.py | |
13 | +++ b/setup.py | |
14 | @@ -101,15 +101,14 @@ else: | |
15 | # support one or the other of these curl-config options, so gracefully | |
16 | # tolerate failure of either, but not both. | |
17 | optbuf = "" | |
18 | - for option in ["--libs", "--static-libs"]: | |
19 | + for option in ["--libs"]: | |
20 | p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True, | |
21 | stdout=subprocess.PIPE) | |
22 | (stdout, stderr) = p.communicate() | |
23 | if p.wait() == 0: | |
24 | optbuf += stdout | |
25 | if optbuf == "": | |
26 | - raise Exception, ("Neither of curl-config --libs or --static-libs" + | |
27 | - "produced output") | |
28 | + raise Exception, ("curl-config --libs did not produce output") | |
29 | libs = split_quoted(optbuf) | |
30 | ||
31 | for e in libs: | |
32 | -- | |
33 | 1.7.1 | |
34 |