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

[bdwalton at users.sourceforge.net]

Revision: 14019
          http://gar.svn.sourceforge.net/gar/?rev=14019&view=rev
Author:   bdwalton
Date:     2011-03-30 17:19:36 +0000 (Wed, 30 Mar 2011)

Log Message:
-----------
gdal/trunk: force use of bash so libtool works

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

Added Paths:
-----------
    csw/mgar/pkg/gdal/trunk/files/0001-Force-the-use-of-CSWbash.patch

Modified: csw/mgar/pkg/gdal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdal/trunk/Makefile	2011-03-30 13:43:17 UTC (rev 14018)
+++ csw/mgar/pkg/gdal/trunk/Makefile	2011-03-30 17:19:36 UTC (rev 14019)
@@ -12,6 +12,7 @@
 
 MASTER_SITES = http://download.osgeo.org/$(NAME)/
 DISTFILES  = $(DISTNAME).tar.gz
+PATCHFILES += 0001-Force-the-use-of-CSWbash.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libz=$(prefix)

Added: csw/mgar/pkg/gdal/trunk/files/0001-Force-the-use-of-CSWbash.patch
===================================================================
--- csw/mgar/pkg/gdal/trunk/files/0001-Force-the-use-of-CSWbash.patch	                        (rev 0)
+++ csw/mgar/pkg/gdal/trunk/files/0001-Force-the-use-of-CSWbash.patch	2011-03-30 17:19:36 UTC (rev 14019)
@@ -0,0 +1,29 @@
+From 25241ade123f17a5e4a381c0057004d28ba7035e Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Wed, 30 Mar 2011 18:00:00 +0200
+Subject: [PATCH] Force the use of CSWbash
+
+This is required to make libtool execute properly since it has
+bashisms.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ GDALmake.opt.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/GDALmake.opt.in b/GDALmake.opt.in
+index bdeba13..4595a2f 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -8,7 +8,7 @@ top_builddir	=	$(GDAL_ROOT)
+ # Solaris users: the LIBTOOL line is expanded to $(SHELL) $(top_builddir)/libtool
+ # but the libtool script uses bashism, so you may need to uncomment the following
+ # line :
+-#SHELL=/usr/bin/bash
++SHELL=/opt/csw/bin/bash
+ 
+ HAVE_LIBTOOL	=	@HAVE_LIBTOOL@
+ LIBTOOL	=	@LIBTOOL@
+-- 
+1.7.3.2
+


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