Revision: 23401
http://sourceforge.net/p/gar/code/23401
Author: guengel
Date: 2014-04-12 18:43:24 +0000 (Sat, 12 Apr 2014)
Log Message:
-----------
geos/trunk: Bumped version to 3.4.2. Enabled 64bit build.
Modified Paths:
--------------
csw/mgar/pkg/geos/trunk/Makefile
csw/mgar/pkg/geos/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/geos/trunk/files/0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch
Removed 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 2014-04-12 18:36:59 UTC (rev 23400)
+++ csw/mgar/pkg/geos/trunk/Makefile 2014-04-12 18:43:24 UTC (rev 23401)
@@ -1,6 +1,6 @@
# $Id$
NAME = geos
-VERSION = 3.3.3
+VERSION = 3.4.2
GARTYPE = v2
DESCRIPTION = Geometry Engine, Open Source
@@ -12,37 +12,26 @@
MASTER_SITES = http://download.osgeo.org/$(NAME)/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES += 0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch
-PATCHFILES += 0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch
GARCOMPILER = GNU
-PACKAGES = CSWlibgeos3-3-3
+PATCHFILES += 0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch
+
+PACKAGES = CSWlibgeos3-4-2
PACKAGES += CSWlibgeos-c1
PACKAGES += CSWgeos-dev
-PACKAGES += CSWrb18-geos3-3-3
-SPKG_DESC_CSWrb18-geos3-3-3 += $(DESCRIPTION), ruby 1.8 bindings
-RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 = CSWruby18
-RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgeos-c1
-RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibruby18-1
-RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgeos3-3-3
-PKGFILES_CSWrb18-geos3-3-3 += .*ruby.*
-CHECKPKG_OVERRIDES_CSWrb18-geos3-3-3 += surplus-dependency|CSWruby18
+SPKG_DESC_CSWlibgeos3-4-2 += $(DESCRIPTION), libgeos-3.4.2.so
+PKGFILES_CSWlibgeos3-4-2 += $(call baseisadirs,$(libdir),libgeos-3\.4\.2\.so)
+PKGFILES_CSWlibgeos3-4-2 += $(call
baseisadirs,$(libdir),libgeos-3\.4\.2\.so(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibgeos3-4-2 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibgeos3-4-2 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibgeos3-4-2 = CSWgeos
-SPKG_DESC_CSWlibgeos3-3-3 += $(DESCRIPTION), libgeos-3.2.2.so
-PKGFILES_CSWlibgeos3-3-3 += $(call baseisadirs,$(libdir),libgeos-3\.3\.3\.so)
-PKGFILES_CSWlibgeos3-3-3 += $(call
baseisadirs,$(libdir),libgeos-3\.3\.3\.so(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibgeos3-3-3 += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibgeos3-3-3 += CSWlibgcc-s1
-OBSOLETED_BY_CSWlibgeos3-3-3 = CSWgeos
-
SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1
-PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.6\.2)
+PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.8\.2)
PKGFILES_CSWlibgeos-c1 += $(call
baseisadirs,$(libdir),libgeos_c\.so\.1(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-3-3
+RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-4-2
RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgcc-s1
OBSOLETED_BY_CSWlibgeos-c1 = CSWgeos
@@ -57,14 +46,37 @@
PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_CONFIG_MANPAGE)
PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE)
PKGFILES_CSWgeos-dev += .*libgeos.so .*libgeos_c.so
-RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-3-3 CSWlibgeos-c1
+RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-4-2 CSWlibgeos-c1
OBSOLETED_BY_CSWlibgeos-dev = CSWgeos
-# c++ libraries, so move things around a bit
-libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR))
+BUILD64 = 1
+##
+## Ruby did not work (no errors, but was not built)
+## Because I want to finish PostGIS, I continue w/o ruby
+##
+
+CONFIGURE_ARGS_32 = --enable-ruby
+# When compiling on AMD64 with -m64 following error is raised
+#
+# /opt/csw/include/ruby-1.9.1/ruby/st.h:67:93: error: size of array
'st_check_for_sizeof_st_index_t' is negative
+# typedef char st_check_for_sizeof_st_index_t[SIZEOF_VOIDP ==
(int)sizeof(st_index_t) ? 1 : -1];
+#
+# So, I'm lazzy and disable ruby on 64bit archs
+CONFIGURE_ARGS_64 = --disable-ruby
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-inline
-CONFIGURE_ARGS += --enable-ruby
+CONFIGURE_ARGS += --disable-static
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORY_MODEL))
+# -B direct breaks code amd64
+LINKER_DIRECT =
+
include gar/category.mk
+
+# The config process decides that the ruby library is called libruby*. That's
+# fine, however, it uses -llibruby*as argument to the compiler/linker. That's
+# bad. So fix it.
+post-configure:
+ gsed -i -E -e 's/^(RUBY_SO_NAME[ ]+=[ ]+)lib(ruby[0-9.]*)\.so.*/\1\2/'
$(WORKSRC)/swig/ruby/Makefile
Modified: csw/mgar/pkg/geos/trunk/checksums
===================================================================
--- csw/mgar/pkg/geos/trunk/checksums 2014-04-12 18:36:59 UTC (rev 23400)
+++ csw/mgar/pkg/geos/trunk/checksums 2014-04-12 18:43:24 UTC (rev 23401)
@@ -1 +1 @@
-8454e653d7ecca475153cc88fd1daa26 geos-3.3.3.tar.bz2
+fc5df2d926eb7e67f988a43a92683bae geos-3.4.2.tar.bz2
Added:
csw/mgar/pkg/geos/trunk/files/0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch
===================================================================
---
csw/mgar/pkg/geos/trunk/files/0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch
(rev 0)
+++
csw/mgar/pkg/geos/trunk/files/0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch
2014-04-12 18:43:24 UTC (rev 23401)
@@ -0,0 +1,32 @@
+From d1b3bd222d685d5d83b777fbf9fedff59eed8685 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <r...@guengel.ch>
+Date: Sun, 30 Mar 2014 11:00:12 +0200
+Subject: [PATCH] use namespace std on isnan when building on solaris with g++
+
+---
+ include/geos/platform.h.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in
+index ab63929..a12cf42 100644
+--- a/include/geos/platform.h.in
++++ b/include/geos/platform.h.in
+@@ -92,11 +92,13 @@ extern "C"
+ // sandro furieri: sanitizing MinGW32
+ # define ISNAN(x) (std::isnan(x))
+ # elif defined(__OSX__) || defined(__APPLE__) || \
+- defined(__NetBSD__) || defined(__DragonFly__) || \
+- (defined(__sun) && defined(__GNUC__))
++ defined(__NetBSD__) || defined(__DragonFly__)
+ // 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(__GNUC__))
++# include <cmath>
++# define ISNAN(x) (std::isnan(x))
+ # elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC)
+ # include <math.h>
+ # define ISNAN(x) (::isnan(x))
+--
+1.8.4.1
+
Deleted:
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
2014-04-12 18:36:59 UTC (rev 23400)
+++
csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch
2014-04-12 18:43:24 UTC (rev 23401)
@@ -1,27 +0,0 @@
-From 27c0baa1a85d3ae19d869979591cf41924a2c4b5 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@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 <bwal...@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.
