SF.net SVN: gar:[22571] csw/mgar/pkg/octave/trunk

[opk at users.sourceforge.net]

Revision: 22571
          http://gar.svn.sourceforge.net/gar/?rev=22571&view=rev
Author:   opk
Date:     2013-11-23 16:52:34 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
use Solaris Studio sunperf library for BLAS/Lapack to build octave

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

Added Paths:
-----------
    csw/mgar/pkg/octave/trunk/files/
    csw/mgar/pkg/octave/trunk/files/0001-make-script-work-with-Solaris-sh.patch
    csw/mgar/pkg/octave/trunk/files/0002-workaround-conflict-with-gets.patch

Modified: csw/mgar/pkg/octave/trunk/Makefile
===================================================================
--- csw/mgar/pkg/octave/trunk/Makefile	2013-11-23 08:53:43 UTC (rev 22570)
+++ csw/mgar/pkg/octave/trunk/Makefile	2013-11-23 16:52:34 UTC (rev 22571)
@@ -1,10 +1,7 @@
 # $Id$
 
-# TBD:
-#  configure: error: You are required to have BLAS and LAPACK libraries
-
 NAME = octave
-VERSION = 3.6.3
+VERSION = 3.6.4
 GARTYPE = v2
 
 DESCRIPTION = The GNU Octave language for numerical computations
@@ -14,9 +11,12 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES    = $(NAME)-$(VERSION).tar.bz2
 
-CONFIGURE_ARGS = $(DIRPATHS)
+PATCHFILES += 0001-make-script-work-with-Solaris-sh.patch 0002-workaround-conflict-with-gets.patch
 
+# using the sunperf library for blas and lapack and therefore also the
+# sunf90 Fortran compiler but the C++ will only build with g++. 
 GARCOMPILER = GNU
+CONFIGURE_ARGS = $(DIRPATHS) F77=sunf90 --with-lapack=sunperf --with-blas=sunperf --without-opengl LD_LIBRARY_PATH="/opt/csw/lib" LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" FFLAGS="-xO2"
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/octave/trunk/checksums
===================================================================
--- csw/mgar/pkg/octave/trunk/checksums	2013-11-23 08:53:43 UTC (rev 22570)
+++ csw/mgar/pkg/octave/trunk/checksums	2013-11-23 16:52:34 UTC (rev 22571)
@@ -1 +1 @@
-29ab7e502e5c963c058906f788670245  octave-3.6.3.tar.bz2
+e0d3e5e3d38a66d3f8593ba065c6e2fd  octave-3.6.4.tar.bz2

Added: csw/mgar/pkg/octave/trunk/files/0001-make-script-work-with-Solaris-sh.patch
===================================================================
--- csw/mgar/pkg/octave/trunk/files/0001-make-script-work-with-Solaris-sh.patch	                        (rev 0)
+++ csw/mgar/pkg/octave/trunk/files/0001-make-script-work-with-Solaris-sh.patch	2013-11-23 16:52:34 UTC (rev 22571)
@@ -0,0 +1,25 @@
+From a75ecf2a90ad3969962fc78e08a8bc7b65ff15fe Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk at opencsw.org>
+Date: Fri, 15 Nov 2013 14:00:51 +0100
+Subject: [PATCH] make script work with Solaris sh
+
+---
+ src/find-defun-files.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/find-defun-files.sh b/src/find-defun-files.sh
+index d8b5ad2..fae1e8e 100755
+--- a/src/find-defun-files.sh
++++ b/src/find-defun-files.sh
+@@ -20,7 +20,7 @@ do
+   else
+     file="$srcdir/$arg"
+   fi
+-  if [ "`$EGREP -l "$DEFUN_PATTERN" $file`" ]; then
++  if $EGREP "$DEFUN_PATTERN" $file >/dev/null; then
+     echo "$file" | $SED 's,.*/,,; s/\.cc$/.df/; s/\.ll$/.df/; s/\.yy$/.df/';
+   fi
+ done
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/octave/trunk/files/0002-workaround-conflict-with-gets.patch
===================================================================
--- csw/mgar/pkg/octave/trunk/files/0002-workaround-conflict-with-gets.patch	                        (rev 0)
+++ csw/mgar/pkg/octave/trunk/files/0002-workaround-conflict-with-gets.patch	2013-11-23 16:52:34 UTC (rev 22571)
@@ -0,0 +1,25 @@
+From 50fa5dfc9c4dc2f3d961f8688cce2332517b9d74 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk at opencsw.org>
+Date: Fri, 15 Nov 2013 14:02:37 +0100
+Subject: [PATCH 3/3] workaround conflict with gets
+
+---
+ libgnu/stdio.in.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgnu/stdio.in.h b/libgnu/stdio.in.h
+index 83f6862..7d56d47 100644
+--- a/libgnu/stdio.in.h
++++ b/libgnu/stdio.in.h
+@@ -706,7 +706,7 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
+    removed it.  */
+ #undef gets
+ #if HAVE_RAW_DECL_GETS
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++/* _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); */
+ #endif
+ 
+ 
+-- 
+1.8.4.1
+

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