summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2012-03-12 11:52:28 +0000
committerfhajny <fhajny@pkgsrc.org>2012-03-12 11:52:28 +0000
commite9330048f9fd82a94c4d66ea774c0c477da18be7 (patch)
treefe60d53979d64946d917319ecb4436c92a482d58 /databases
parentffb64c72dd610736a426426ac7570cafe20e5c22 (diff)
downloadpkgsrc-e9330048f9fd82a94c4d66ea774c0c477da18be7.tar.gz
Avoid double definition of double on SunOS.
Diffstat (limited to 'databases')
-rw-r--r--databases/py-psycopg2/distinfo3
-rw-r--r--databases/py-psycopg2/patches/patch-psycopg_config.h14
2 files changed, 16 insertions, 1 deletions
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index 7b0ac05771d..e9daa6de4cd 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2012/01/26 10:49:41 obache Exp $
+$NetBSD: distinfo,v 1.12 2012/03/12 11:52:28 fhajny Exp $
SHA1 (psycopg2-2.4.4.tar.gz) = 1f0a26588f1cf03b9aea028e0177cf3b7ef78e60
RMD160 (psycopg2-2.4.4.tar.gz) = 46223bd6fa7bab95e720ef77406ed95d1c678944
Size (psycopg2-2.4.4.tar.gz) = 691109 bytes
+SHA1 (patch-psycopg_config.h) = 4678e0c807a07f350317f414b3a47c99e4c38b91
diff --git a/databases/py-psycopg2/patches/patch-psycopg_config.h b/databases/py-psycopg2/patches/patch-psycopg_config.h
new file mode 100644
index 00000000000..3e9e28b0a35
--- /dev/null
+++ b/databases/py-psycopg2/patches/patch-psycopg_config.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-psycopg_config.h,v 1.1 2012/03/12 11:52:28 fhajny Exp $
+
+double defined on SunOS with GCC.
+--- psycopg/config.h.orig 2011-06-08 07:42:46.000000000 +0000
++++ psycopg/config.h
+@@ -141,7 +141,7 @@ static int pthread_mutex_init(pthread_mu
+ #endif
+ #endif
+
+-#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
++#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || ((defined(__sun__) || defined(sun)) && !defined(__GNUC__))
+ /* what's this, we have no round function either? */
+ static double round(double num)
+ {