[20572] trunk/dports/math/octave
source_changes at macosforge.org
source_changes at macosforge.org
Tue Nov 7 15:07:21 PST 2006
Revision: 20572
http://trac.macosforge.org/projects/macports/changeset/20572
Author: stechert at macports.org
Date: 2006-11-07 15:07:20 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
Finally, thanks to some advice from Michael Ross, octave builds on the x86
platform. PPC coming soon.
Modified Paths:
--------------
trunk/dports/math/octave/Portfile
Added Paths:
-----------
trunk/dports/math/octave/files/patch-configure
Removed Paths:
-------------
trunk/dports/math/octave/files/patch-configure-casesensitivefs
trunk/dports/math/octave/files/patch-configure-gcc34argbug
trunk/dports/math/octave/files/patch-configure-uglydefs
Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile 2006-11-07 20:58:43 UTC (rev 20571)
+++ trunk/dports/math/octave/Portfile 2006-11-07 23:07:20 UTC (rev 20572)
@@ -23,14 +23,15 @@
checksums md5 a76a6d88f414285472896a63e4282b7f
patch.args -p1
-patchfiles patch-configure-uglydefs
+patchfiles patch-configure
depends_build bin:texinfo:texinfo \
bin:tex:teTeX
depends_lib lib:libreadline.5:readline \
port:hdf5 \
- port:fftw-3
+ port:fftw-3 \
+ port:SuiteSparse
depends_run bin:gnuplot:gnuplot \
port:gcc34
@@ -82,14 +83,10 @@
configure.env-delete F77="g77-dp-3.4"
configure.env-delete FLIBS="-lg2c"
- configure.env-append CC="gcc-dp-4.2"
- configure.env-append CXX="g++-dp-4.2"
configure.env-append F77="gfortran-dp-4.2"
- configure.args-delete --disable-static
- configure.args-delete --enable-dl
- configure.args-delete --enable-shared
configure.args-append --with-blas="-framework Accelerate"
+ configure.args-delete --enable-dl
}
default_variants +test
Added: trunk/dports/math/octave/files/patch-configure
===================================================================
--- trunk/dports/math/octave/files/patch-configure (rev 0)
+++ trunk/dports/math/octave/files/patch-configure 2006-11-07 23:07:20 UTC (rev 20572)
@@ -0,0 +1,57 @@
+--- octave-2.9.9.orig/configure 2006-10-02 13:04:13.000000000 -0700
++++ octave-2.9.9/configure 2006-11-07 00:28:15.000000000 -0800
+@@ -17238,7 +17238,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
+ echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
+ if test $ac_cv_lib_cholmod_cholmod_start = yes; then
+- CHOLMOD_LIBS="-lcholmod -lmetis";
++ CHOLMOD_LIBS="-lcholmod -lcamd -lmetis";
+ with_cholmod=yes
+ else
+
+@@ -17328,7 +17328,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
+ echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
+ if test $ac_cv_lib_cholmod_cholmod_start = yes; then
+- CHOLMOD_LIBS="-lcholmod -cblas -lmetis"; with_cholmod=yes
++ CHOLMOD_LIBS="-lcholmod -lcamd -cblas -lmetis"; with_cholmod=yes
+ fi
+
+ fi
+@@ -17420,7 +17420,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
+ echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
+ if test $ac_cv_lib_cholmod_cholmod_start = yes; then
+- CHOLMOD_LIBS="-lcholmod";
++ CHOLMOD_LIBS="-lcholmod -lcamd";
+ with_cholmod=yes
+ else
+
+@@ -17510,7 +17510,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
+ echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
+ if test $ac_cv_lib_cholmod_cholmod_start = yes; then
+- CHOLMOD_LIBS="-lcholmod -cblas";
++ CHOLMOD_LIBS="-lcholmod -lcamd -cblas";
+ with_cholmod=yes
+ fi
+
+@@ -17919,7 +17919,7 @@
+ RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
+ ;;
+ *-*-darwin*)
+- DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)'
++ DL_LDFLAGS='$(LDFLAGS) -bundle -bundle_loader $(TOPDIR)/src/octave'
+ MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)'
+ SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
+ CXXPICFLAG=
+@@ -30652,9 +30652,6 @@
+
+
+ case "$canonical_host_type" in
+- *-*-darwin*)
+- UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\",g'`
+- ;;
+ *)
+ UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'`
+ ;;
Deleted: trunk/dports/math/octave/files/patch-configure-casesensitivefs
===================================================================
--- trunk/dports/math/octave/files/patch-configure-casesensitivefs 2006-11-07 20:58:43 UTC (rev 20571)
+++ trunk/dports/math/octave/files/patch-configure-casesensitivefs 2006-11-07 23:07:20 UTC (rev 20572)
@@ -1,20 +0,0 @@
---- configure.orig 2006-02-01 15:25:49.000000000 +0200
-+++ configure 2006-02-01 15:24:59.000000000 +0200
-@@ -17193,7 +17193,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--#include <Mach-O/dyld.h>
-+#include <mach-o/dyld.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -17236,7 +17236,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <Mach-O/dyld.h>
-+#include <mach-o/dyld.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
Deleted: trunk/dports/math/octave/files/patch-configure-gcc34argbug
===================================================================
--- trunk/dports/math/octave/files/patch-configure-gcc34argbug 2006-11-07 20:58:43 UTC (rev 20571)
+++ trunk/dports/math/octave/files/patch-configure-gcc34argbug 2006-11-07 23:07:20 UTC (rev 20572)
@@ -1,12 +0,0 @@
---- configure.orig 2006-02-01 13:08:33.000000000 +0200
-+++ configure 2006-02-01 13:08:42.000000000 +0200
-@@ -11049,7 +11049,7 @@
- RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
- ;;
- *-*-darwin*)
-- DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)'
-+ DL_LDFLAGS='$(LDFLAGS) -bundle -bundle_loader $(TOPDIR)/src/octave'
- MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)'
- SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
- CXXPICFLAG=
-
Deleted: trunk/dports/math/octave/files/patch-configure-uglydefs
===================================================================
--- trunk/dports/math/octave/files/patch-configure-uglydefs 2006-11-07 20:58:43 UTC (rev 20571)
+++ trunk/dports/math/octave/files/patch-configure-uglydefs 2006-11-07 23:07:20 UTC (rev 20572)
@@ -1,12 +0,0 @@
---- octave-2.1.73.orig/configure 2006-03-20 13:12:22.000000000 -0800
-+++ octave-2.1.73/configure 2006-10-29 16:42:30.000000000 -0800
-@@ -21460,9 +21460,6 @@
-
-
- case "$canonical_host_type" in
-- *-*-darwin*)
-- UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\",g'`
-- ;;
- *)
- UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'`
- ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061107/857407da/attachment.html
More information about the macports-changes
mailing list