diff options
author | jperkin <jperkin@pkgsrc.org> | 2018-04-05 09:45:13 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2018-04-05 09:45:13 +0000 |
commit | 8275ae0c2affa2e77ffd04f8eb841aec6a7eb61b (patch) | |
tree | 348914094fbe9739cdf3eb0d461590357ab945a4 /databases/py-psycopg2 | |
parent | c835b39981fcb7ab340f8105a3f9d2240a9061bd (diff) | |
download | pkgsrc-8275ae0c2affa2e77ffd04f8eb841aec6a7eb61b.tar.gz |
py-psycopg2: Only supply timer funcs if they are missing.
Diffstat (limited to 'databases/py-psycopg2')
-rw-r--r-- | databases/py-psycopg2/distinfo | 4 | ||||
-rw-r--r-- | databases/py-psycopg2/patches/patch-psycopg_solaris__support.c | 15 | ||||
-rw-r--r-- | databases/py-psycopg2/patches/patch-psycopg_solaris__support.h | 18 |
3 files changed, 36 insertions, 1 deletions
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo index e8b6defa9e9..d2416f93935 100644 --- a/databases/py-psycopg2/distinfo +++ b/databases/py-psycopg2/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.30 2018/02/12 08:15:37 adam Exp $ +$NetBSD: distinfo,v 1.31 2018/04/05 09:45:13 jperkin Exp $ SHA1 (psycopg2-2.7.4.tar.gz) = d030339fdde7c99f81593d8933cb712aa72ab6c2 RMD160 (psycopg2-2.7.4.tar.gz) = e4d938680cf375d4d92d1ec7104a803ca23e4947 SHA512 (psycopg2-2.7.4.tar.gz) = e78db528a4d3b897e0d8d38755179082dacddfb2d10bda963fc3836548991eaa0d4c1b8f81b329b15f4e685046c39e6f2a352b6c47b1da42af3a262094233034 Size (psycopg2-2.7.4.tar.gz) = 425331 bytes +SHA1 (patch-psycopg_solaris__support.c) = 2d024f2d34ebc84df51c652ccc710270f438bf0c +SHA1 (patch-psycopg_solaris__support.h) = 2b563de72df84e04942ce144c8a0260ac79f7105 diff --git a/databases/py-psycopg2/patches/patch-psycopg_solaris__support.c b/databases/py-psycopg2/patches/patch-psycopg_solaris__support.c new file mode 100644 index 00000000000..42bf466a040 --- /dev/null +++ b/databases/py-psycopg2/patches/patch-psycopg_solaris__support.c @@ -0,0 +1,15 @@ +$NetBSD: patch-psycopg_solaris__support.c,v 1.1 2018/04/05 09:45:13 jperkin Exp $ + +Only supply timeradd/timersub if they are missing. + +--- psycopg/solaris_support.c.orig 2018-02-06 02:48:43.000000000 +0000 ++++ psycopg/solaris_support.c +@@ -27,7 +27,7 @@ + #include "psycopg/psycopg.h" + #include "psycopg/solaris_support.h" + +-#if defined(__sun) && defined(__SVR4) ++#if defined(__sun) && defined(__SVR4) && !defined(timeradd) + /* timeradd is missing on Solaris */ + void + timeradd(struct timeval *a, struct timeval *b, struct timeval *c) diff --git a/databases/py-psycopg2/patches/patch-psycopg_solaris__support.h b/databases/py-psycopg2/patches/patch-psycopg_solaris__support.h new file mode 100644 index 00000000000..fc34ace2e12 --- /dev/null +++ b/databases/py-psycopg2/patches/patch-psycopg_solaris__support.h @@ -0,0 +1,18 @@ +$NetBSD: patch-psycopg_solaris__support.h,v 1.1 2018/04/05 09:45:13 jperkin Exp $ + +Only supply timeradd/timersub if they are missing. + +--- psycopg/solaris_support.h.orig 2018-02-06 02:48:43.000000000 +0000 ++++ psycopg/solaris_support.h +@@ -29,9 +29,10 @@ + + #if defined(__sun) && defined(__SVR4) + #include <sys/time.h> +- ++#ifndef timeradd + extern HIDDEN void timeradd(struct timeval *a, struct timeval *b, struct timeval *c); + extern HIDDEN void timersub(struct timeval *a, struct timeval *b, struct timeval *c); + #endif ++#endif + + #endif /* !defined(PSYCOPG_SOLARIS_SUPPORT_H) */ |