35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 0796c0530648ae0e741a20a78d1fcf315783c178 Mon Sep 17 00:00:00 2001
|
|
From: Kamil Dudka <kdudka@redhat.com>
|
|
Date: Mon, 25 Feb 2013 19:48:22 +0100
|
|
Subject: [PATCH 1/2] setup.py: do not use curl-config --static-libs
|
|
|
|
---
|
|
setup.py | 5 ++---
|
|
1 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 76b9d58..86a2951 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -101,15 +101,14 @@ else:
|
|
# support one or the other of these curl-config options, so gracefully
|
|
# tolerate failure of either, but not both.
|
|
optbuf = ""
|
|
- for option in ["--libs", "--static-libs"]:
|
|
+ for option in ["--libs"]:
|
|
p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True,
|
|
stdout=subprocess.PIPE)
|
|
(stdout, stderr) = p.communicate()
|
|
if p.wait() == 0:
|
|
optbuf += stdout
|
|
if optbuf == "":
|
|
- raise Exception, ("Neither of curl-config --libs or --static-libs" +
|
|
- "produced output")
|
|
+ raise Exception, ("curl-config --libs did not produce output")
|
|
libs = split_quoted(optbuf)
|
|
|
|
for e in libs:
|
|
--
|
|
1.7.1
|
|
|