[csw-devel] SF.net SVN: gar:[18553] csw/mgar/pkg/gdal/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 18553
          http://gar.svn.sourceforge.net/gar/?rev=18553&view=rev
Author:   bdwalton
Date:     2012-06-27 00:39:56 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
gdal/trunk: switch back to g++, add iconv2 dep, move back to gxx paths

Modified Paths:
--------------
    csw/mgar/pkg/gdal/trunk/Makefile

Modified: csw/mgar/pkg/gdal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdal/trunk/Makefile	2012-06-26 14:33:12 UTC (rev 18552)
+++ csw/mgar/pkg/gdal/trunk/Makefile	2012-06-27 00:39:56 UTC (rev 18553)
@@ -11,6 +11,8 @@
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
+GARCOMPILER = GNU
+
 MASTER_SITES = http://download.osgeo.org/$(NAME)/
 DISTFILES  = $(DISTNAME).tar.gz
 PATCHFILES += 0001-Force-use-of-double-data-type-before-checking-for-is.patch
@@ -42,6 +44,7 @@
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibpq5
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWgdal += CSWlibiconv2
 
 PACKAGES += CSWlibgdal1
 CATALOGNAME_CSWlibgdal1 = libgdal1
@@ -63,6 +66,7 @@
 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5
 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibiconv2
 PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0)
 PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*)
 
@@ -72,8 +76,13 @@
 RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1
 PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) /opt/csw/bin/gdal-config
 
+libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR))
+includedir = /opt/csw/gxx/include
+
 # enable use of __func__ as required by patch 0004
+ifneq ($(GARCOMPILER),GNU)
 EXTRA_CXXFLAGS += -features=extensions
+endif
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libz=$(prefix)

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