From 64c6a7a41e53b288b5cf5fcc0097421228261f07 Mon Sep 17 00:00:00 2001 From: Mihai Prica Date: Thu, 27 Jun 2013 14:15:51 +0300 Subject: python-psycopg2: Renamed patch Added the reason for why it is necessary and the UpstreamStatus to the patch. Signed-off-by: Mihai Prica --- .../python/python-psycopg2/quick-fix.patch | 17 ----------------- .../python/python-psycopg2/remove-pg-config.patch | 20 ++++++++++++++++++++ .../recipes-devtools/python/python-psycopg2_2.5.bb | 2 +- 3 files changed, 21 insertions(+), 18 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/python/python-psycopg2/quick-fix.patch create mode 100644 meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch (limited to 'meta-openstack/recipes-devtools/python') diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2/quick-fix.patch b/meta-openstack/recipes-devtools/python/python-psycopg2/quick-fix.patch deleted file mode 100644 index 0fa6e5e..0000000 --- a/meta-openstack/recipes-devtools/python/python-psycopg2/quick-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: psycopg2-2.5/setup.py -=================================================================== ---- psycopg2-2.5.orig/setup.py -+++ psycopg2-2.5/setup.py -@@ -377,9 +377,9 @@ 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")) -+ #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 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 new file mode 100644 index 0000000..104d692 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch @@ -0,0 +1,20 @@ +Upstream-status: Inappropriate [embedded specific] + +The package uses the pg_config command to detect the libdir and includedir path. +Commented the lines because the command is not available at buildtime and the +package succesfully build without them. + +Index: psycopg2-2.5/setup.py +=================================================================== +--- psycopg2-2.5.orig/setup.py ++++ psycopg2-2.5/setup.py +@@ -377,9 +377,6 @@ 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 diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb index 5206ae0..c93e62b 100644 --- a/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb +++ b/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb @@ -9,7 +9,7 @@ PR = "r0" SRCNAME = "psycopg2" SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ - file://quick-fix.patch" + file://remove-pg-config.patch" SRC_URI[md5sum] = "facd82faa067e99b80146a0ee2f842f6" SRC_URI[sha256sum] = "6b2f0cc9199de9eaa53ba10ff69b2741e73484b24657e69bdae259561c23bde4" -- cgit v1.2.3-54-g00ecf