diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2015-08-05 16:29:48 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-08-06 09:35:50 -0400 |
commit | 0694253b5e99de0d8e2e77bf186680b1f6479c27 (patch) | |
tree | faa7411a5fb8c42bd70cc70a3b9b493ec1a4014a /meta-openstack/recipes-devtools/python/python-psycopg2 | |
parent | b709c1405bc359f304f0dccd575e719f3336e9d6 (diff) | |
download | meta-cloud-services-0694253b5e99de0d8e2e77bf186680b1f6479c27.tar.gz |
python-psycopg2: reinstate patch to avoid pg_config
When building we get an error:
Error: pg_config executable not found.
Previously there was a patch that removed references to pg_config.
This patch was dropped during the version uprev for an unknown
reason. Reinstate this patch with minor updates to allow it to patch
the new version of python-psycopg2 and get the build working again.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-psycopg2')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch | 63 |
1 files changed, 42 insertions, 21 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch index 6b72ef7..b2f94dd 100644 --- a/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch +++ b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch | |||
@@ -1,14 +1,37 @@ | |||
1 | Upstream-status: Inappropriate [embedded specific] | 1 | From 392c4581da49f133938e70f6215bfebba28ecc56 Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | ||
3 | Date: Tue, 4 Aug 2015 20:59:18 -0400 | ||
4 | Subject: [PATCH] setup: don't use pg_config | ||
2 | 5 | ||
3 | The package uses the pg_config command to detect the libdir and includedir path. | 6 | The package uses the pg_config command to detect the libdir and |
4 | Commented the lines because the command is not available at buildtime and the | 7 | includedir path. Commented the lines because the command is not |
5 | package succesfully build without them. | 8 | available at buildtime and the package succesfully build without them. |
6 | 9 | ||
7 | Index: psycopg2-2.5/setup.py | 10 | Signed-off-by: Mark Asselstine <bruce.ashfield@windriver.com> |
8 | =================================================================== | 11 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
9 | --- psycopg2-2.5.orig/setup.py | 12 | --- |
10 | +++ psycopg2-2.5/setup.py | 13 | setup.cfg | 2 +- |
11 | @@ -377,9 +377,6 @@ | 14 | setup.py | 5 +---- |
15 | 2 files changed, 2 insertions(+), 5 deletions(-) | ||
16 | |||
17 | diff --git a/setup.cfg b/setup.cfg | ||
18 | index 90a47dd..986871b 100644 | ||
19 | --- a/setup.cfg | ||
20 | +++ b/setup.cfg | ||
21 | @@ -9,7 +9,7 @@ define= | ||
22 | # build psycopg2. If pg_config is not in the path or is installed under a | ||
23 | # different name uncomment the following option and set it to the pg_config | ||
24 | # full path. | ||
25 | -#pg_config= | ||
26 | +pg_config="/bin/true" | ||
27 | |||
28 | # Set to 1 to use Python datetime objects for default date/time representation. | ||
29 | use_pydatetime=1 | ||
30 | diff --git a/setup.py b/setup.py | ||
31 | index 975fe10..85502ca 100644 | ||
32 | --- a/setup.py | ||
33 | +++ b/setup.py | ||
34 | @@ -389,16 +389,13 @@ class psycopg_build_ext(build_ext): | ||
12 | self.libraries.append("pq") | 35 | self.libraries.append("pq") |
13 | 36 | ||
14 | try: | 37 | try: |
@@ -18,16 +41,14 @@ Index: psycopg2-2.5/setup.py | |||
18 | try: | 41 | try: |
19 | # Here we take a conservative approach: we suppose that | 42 | # Here we take a conservative approach: we suppose that |
20 | # *at least* PostgreSQL 7.4 is available (this is the only | 43 | # *at least* PostgreSQL 7.4 is available (this is the only |
21 | Index: psycopg2-2.5/setup.cfg | 44 | # 7.x series supported by psycopg 2) |
22 | =================================================================== | 45 | pgversion = pg_config_helper.query("version").split()[1] |
23 | --- psycopg2-2.5.orig/setup.cfg | 46 | except: |
24 | +++ psycopg2-2.5/setup.cfg | 47 | - pgversion = "7.4.0" |
25 | @@ -11,7 +11,7 @@ | 48 | + pgversion = "9.4.4" |
26 | # build psycopg2. If pg_config is not in the path or is installed under a | ||
27 | # different name uncomment the following option and set it to the pg_config | ||
28 | # full path. | ||
29 | -#pg_config= | ||
30 | +pg_config="/bin/true" | ||
31 | 49 | ||
32 | # Set to 1 to use Python datetime objects for default date/time representation. | 50 | verre = re.compile( |
33 | use_pydatetime=1 | 51 | r"(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|(alpha|beta|rc)\d+))") |
52 | -- | ||
53 | 2.1.4 | ||
54 | |||