pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/geography/proj proj: fix build on sunos



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a801b3ccd988
branches:  trunk
changeset: 372854:a801b3ccd988
user:      wiedi <wiedi%pkgsrc.org@localhost>
date:      Tue Dec 19 01:57:47 2017 +0000

description:
proj: fix build on sunos

diffstat:

 geography/proj/distinfo                      |   3 ++-
 geography/proj/patches/patch-src_pj__mutex.c |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 38215019cc59 -r a801b3ccd988 geography/proj/distinfo
--- a/geography/proj/distinfo   Tue Dec 19 00:58:50 2017 +0000
+++ b/geography/proj/distinfo   Tue Dec 19 01:57:47 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2016/10/27 22:14:19 gdt Exp $
+$NetBSD: distinfo,v 1.7 2017/12/19 01:57:47 wiedi Exp $
 
 SHA1 (proj-4.9.3.tar.gz) = 2f5a1f13d65f9ac35bbad1e3449f32b256967856
 RMD160 (proj-4.9.3.tar.gz) = cffdce968c8929fd7f38a65e3d905a62858589a2
@@ -9,3 +9,4 @@
 SHA512 (proj-datumgrid-1.5.tar.gz) = 37f3d50e7efbebc6a0e5f48926f85d4c3e651b2d20de055c96da352c21dbb649e70f7f7a5efd15225a04a610007a925b3785c46730f8b50ff390e181c084b440
 Size (proj-datumgrid-1.5.tar.gz) = 2252308 bytes
 SHA1 (patch-README) = 05ec5a5aa1b1e3f54dc4b313b308a8124c236172
+SHA1 (patch-src_pj__mutex.c) = d2bc1a32579172ece5c2cdc0e9f40121ddeb5044
diff -r 38215019cc59 -r a801b3ccd988 geography/proj/patches/patch-src_pj__mutex.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/proj/patches/patch-src_pj__mutex.c      Tue Dec 19 01:57:47 2017 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_pj__mutex.c,v 1.1 2017/12/19 01:57:48 wiedi Exp $
+
+fix build on SunOS
+upstream commit: https://github.com/OSGeo/proj.4/commit/181cd2f3374f3a030b198dc4d2aace467637b584
+
+--- src/pj_mutex.c.orig        2016-08-29 18:47:58.000000000 +0000
++++ src/pj_mutex.c
+@@ -28,7 +28,7 @@
+ 
+ /* projects.h and windows.h conflict - avoid this! */
+ 
+-#if defined(MUTEX_pthread) && !defined(_XOPEN_SOURCE)
++#if defined(MUTEX_pthread) && !defined(_XOPEN_SOURCE) && !defined(__sun)
+ /* For pthread_mutexattr_settype */
+ #define _XOPEN_SOURCE 500
+ #endif



Home | Main Index | Thread Index | Old Index