[csw-devel] SF.net SVN: gar:[17808] csw/mgar/pkg/geos/trunk

[bdwalton at users.sourceforge.net]

Revision: 17808
          http://gar.svn.sourceforge.net/gar/?rev=17808&view=rev
Author:   bdwalton
Date:     2012-04-21 22:05:18 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
geos/trunk: version bump, use gxx libdir; solaris 10 only; patch a c++ on solaris w/g++ issue

Modified Paths:
--------------
    csw/mgar/pkg/geos/trunk/Makefile
    csw/mgar/pkg/geos/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch

Modified: csw/mgar/pkg/geos/trunk/Makefile
===================================================================
--- csw/mgar/pkg/geos/trunk/Makefile	2012-04-21 17:06:25 UTC (rev 17807)
+++ csw/mgar/pkg/geos/trunk/Makefile	2012-04-21 22:05:18 UTC (rev 17808)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = geos
-VERSION = 3.2.2
+VERSION = 3.3.3
 CATEGORIES = lib
 GARTYPE = v2
 
@@ -9,8 +9,11 @@
 GEOS (Geometry Engine - Open Source) is a C++ port of the  Java Topology Suite (JTS). As such, it aims to contain the complete functionality of JTS in C++. This includes all the  OpenGIS Simple Features for SQL spatial predicate functions and spatial operators, as well as specific JTS enhanced topology functions.
 endef
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 MASTER_SITES = http://download.osgeo.org/$(NAME)/
 DISTFILES  = $(DISTNAME).tar.bz2
+PATCHFILES += 0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch
 
 GARCOMPILER = GNU
 
@@ -62,7 +65,11 @@
 RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-2-2 CSWlibgeos-c1
 OBSOLETED_BY_CSWlibgeos-dev = CSWgeos
 
+# c++ libraries, so move things around a bit
+libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR))
+
 CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-inline
 CONFIGURE_ARGS += --enable-ruby
 
 include gar/category.mk

Modified: csw/mgar/pkg/geos/trunk/checksums
===================================================================
--- csw/mgar/pkg/geos/trunk/checksums	2012-04-21 17:06:25 UTC (rev 17807)
+++ csw/mgar/pkg/geos/trunk/checksums	2012-04-21 22:05:18 UTC (rev 17808)
@@ -1 +1 @@
-c5d264acac22fe7720f85dadc1fc17c6  geos-3.2.2.tar.bz2
+8454e653d7ecca475153cc88fd1daa26  geos-3.3.3.tar.bz2

Added: csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch
===================================================================
--- csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch	                        (rev 0)
+++ csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch	2012-04-21 22:05:18 UTC (rev 17808)
@@ -0,0 +1,27 @@
+From 27c0baa1a85d3ae19d869979591cf41924a2c4b5 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 21 Apr 2012 23:01:26 +0200
+Subject: [PATCH] use namespace std on isnan when building on solaris with g++
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ include/geos/platform.h.in |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in
+index effcdb5..2504b15 100644
+--- a/include/geos/platform.h.in
++++ b/include/geos/platform.h.in
+@@ -95,6 +95,9 @@ extern "C"
+    // Hack for OS/X <cmath> incorrectly re-defining isnan() into oblivion.
+    // It does leave a version in std.
+ #  define ISNAN(x) (std::isnan(x))
++# elif (defined(__sun) || defined(__sun__)) && defined(__GNUG__)
++#  include <math.h>
++#  define ISNAN(x) (std::isnan(x))
+ # elif defined(__sun) || defined(__sun__)
+ #  include <math.h>
+ #  define ISNAN(x) (::isnan(x))
+-- 
+1.7.10
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.