From de2769f893f7625289a1922345814d3ad108f49e Mon Sep 17 00:00:00 2001 From: fhajny Date: Mon, 12 Mar 2012 11:52:28 +0000 Subject: Avoid double definition of double on SunOS. --- databases/py-psycopg2/distinfo | 3 ++- databases/py-psycopg2/patches/patch-psycopg_config.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 databases/py-psycopg2/patches/patch-psycopg_config.h (limited to 'databases') 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) + { -- cgit v1.2.3