blob: 8f426f50244bb6bd1460039a7133507b9e1d4e13 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From 92d42775735d1555449b860c214ca7265d7ad75b Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Tue, 24 Jan 2017 00:43:35 +0900
Subject: [PATCH] setup: don't use pg_config
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
setup.cfg | 1 +
setup.py | 5 +----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/setup.cfg b/setup.cfg
index d00ce92..4b45aac 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[build_ext]
define =
-pg_config =
+pg_config="/bin/true"
use_pydatetime = 1
mx_include_dir =
have_ssl = 0
diff --git a/setup.py b/setup.py
index d71d489..b101696 100644
--- a/setup.py
+++ b/setup.py
@@ -398,16 +398,13 @@ class psycopg_build_ext(build_ext):
self.libraries.append("pq")
try:
- self.library_dirs.append(pg_config_helper.query("libdir"))
- self.include_dirs.append(pg_config_helper.query("includedir"))
- self.include_dirs.append(pg_config_helper.query("includedir-server"))
try:
# Here we take a conservative approach: we suppose that
# *at least* PostgreSQL 7.4 is available (this is the only
# 7.x series supported by psycopg 2)
pgversion = pg_config_helper.query("version").split()[1]
except:
- pgversion = "7.4.0"
+ pgversion = "9.4.4"
verre = re.compile(
r"(\d+)(?:\.(\d+))?(?:(?:\.(\d+))|(devel|(?:alpha|beta|rc)\d+))?")
--
2.7.4
|
