[22906] trunk/dports/math/octave/Portfile

source_changes at macosforge.org source_changes at macosforge.org
Sun Mar 18 10:00:59 PDT 2007


Revision: 22906
          http://trac.macosforge.org/projects/macports/changeset/22906
Author:   takanori at macports.org
Date:     2007-03-18 10:00:59 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
In some cases, MacPorts may try to install gcc40 regardless of platform. This is a workaround.

Modified Paths:
--------------
    trunk/dports/math/octave/Portfile

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2007-03-18 16:59:51 UTC (rev 22905)
+++ trunk/dports/math/octave/Portfile	2007-03-18 17:00:59 UTC (rev 22906)
@@ -32,15 +32,13 @@
 depends_lib     port:readline			\
 		port:hdf5			\
 		port:fftw-3			\
-		port:gcc40			\
 		port:metis			\
 		port:SuiteSparse		\
 		port:pcre			\
 		port:glpk			\
 		port:gnuplot
 
-configure.env   F77="gfortran-dp-4.0"	\
-		CFLAGS="-O2"		\
+configure.env   CFLAGS="-O2"		\
 		CXXFLAGS="-O2"		\
 		LDFLAGS="-L${prefix}/lib" \
 		CPPFLAGS="-I${prefix}/include"
@@ -71,12 +69,16 @@
 	file rename -force ${worksrcpath}/src/oct-conf.h.tmp ${destroot}${prefix}/include/${name}-${version}/${name}/oct-conf.h
 }
 
-platform darwin 8 i386 {
+platform powerpc {
 	if {![variant_isset g95]} {
-		depends_lib-delete	port:gcc40
-		depends_lib-append	port:gcc42
+		depends_lib-append	port:gcc40
+		configure.env-append	F77="gfortran-dp-4.0"
+	}
+}
 
-		configure.env-delete	F77="gfortran-dp-4.0"
+platform i386 {
+	if {![variant_isset g95]} {
+		depends_lib-append	port:gcc42
 		configure.env-append	F77="gfortran-dp-4.2"
 		configure.env-append	CC="gcc-dp-4.2"
 		configure.env-append	CXX="g++-dp-4.2"
@@ -95,9 +97,6 @@
 }
 
 variant g95 {
-	depends_lib-delete	port:gcc40
 	depends_lib-append	port:g95
-
-	configure.env-delete	F77="gfortran-dp-4.0"
 	configure.env-append	F77="${prefix}/bin/g95" FFLAGS=-O2 MACOSX_DEPLOYMENT_TARGET=10.4
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070318/7764d679/attachment.html


More information about the macports-changes mailing list