[75513] trunk/dports/math/octave-devel

27 Jan 2011

Revision: 75513
          http://trac.macports.org/changeset/75513
Author:   michaelld@macports.org
Date:     2011-01-27 12:03:50 -0800 (Thu, 27 Jan 2011)
Log Message:
-----------
octave-devel:
 * Apply patch from ticket #28154; fixes that ticket.
 * Clean up setting of GCC variant.
 * remove unnecessary patchfile and unused code.

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

Removed Paths:
-------------
    trunk/dports/math/octave-devel/files/patch-lo-specfun.cc.diff

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================

--- trunk/dports/math/octave-devel/Portfile	2011-01-27 19:47:46 UTC (rev 75512)
+++ trunk/dports/math/octave-devel/Portfile	2011-01-27 20:03:50 UTC (rev 75513)
@@ -5,6 +5,7 @@
 
 name                octave-devel
 version             3.3.90
+revision            1
 conflicts           octave
 categories          math science
 maintainers         michaelld openmaintainer
@@ -58,11 +59,6 @@
 # flag, which means this port cannot easy compile as universal.
 patchfiles-append patch-configure.diff
 
-platform darwin 10 {
-    # for 10.6 only
-    patchfiles-append patch-lo-specfun.cc.diff
-}
-
 universal_variant   no
 
 configure.args      --without-x \
@@ -112,38 +108,51 @@
                      TEXI2DVI="${prefix}/bin/texi2dvi" \
                      TEXI2PDF="${prefix}/bin/texi2pdf" \
                      FLTK_CONFIG=no
+configure.cppflags
+configure.ldflags
 
-### parallel build is supposed to work now
-# use_parallel_build  no
-
 test.run            yes
 test.target         check
 
-variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc45 gcc44 g95 {
-    depends_build-append    port:gcc43
-    configure.compiler      macports-gcc-4.3
-}
+variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc45 gcc44 g95 {}
 
-variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc45 gcc43 g95 {
-    depends_build-append    port:gcc44
-    configure.compiler      macports-gcc-4.4
-}
+variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc45 gcc43 g95 {}
 
-variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc44 gcc43 g95 {
-    depends_build-append    port:gcc45
-    configure.compiler      macports-gcc-4.5
-}
+variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc44 gcc43 g95 {}
 
 variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 {
     depends_build-append    port:g95
     configure.f77           "${prefix}/bin/g95"
 }
 
+# check for default variant
 if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
          ![variant_isset gcc45] && ![variant_isset g95] } {
     default_variants +gcc44
 }
 
+# check for just -gcc44
+if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
+         ![variant_isset gcc45] && ![variant_isset g95] } {
+    error "You cannot use the variant -gcc44 alone."
+}
+
+set gcc_version ""
+if {[variant_isset gcc43]} {
+    set gcc_version "4.3"
+} elseif {[variant_isset gcc44]} {
+    set gcc_version "4.4"
+} elseif {[variant_isset gcc45]} {
+    set gcc_version "4.5"
+}
+
+if {${gcc_version} != ""} {
+    set gcc_version_join [join [split ${gcc_version} "."] ""]
+    configure.ldflags    "${prefix}/lib/gcc${gcc_version_join}/libstdc++.6.dylib"
+    depends_build-append port:gcc${gcc_version_join}
+    configure.compiler   macports-gcc-${gcc_version}
+}
+
 variant docs description {Enable creation and installation of documentation} {
     configure.args-replace s|--disable-docs|--enable-docs|
 }
@@ -170,10 +179,10 @@
 
 #variant fltk description {Include FLTK option} {
 #    depends_lib-append port:fltk-devel
-#    post-patch
-        # fix use of #include Fl -> FL
+#    post-patch {
+#        # fix use of #include Fl -> FL
 #        reinplace "/include/s,Fl/,FL/,g"
-#            ${worksrcpath}/src/DLD-FUNCTIONS/fltk_backend.cc
+#            ${worksrcpath}/src/DLD-FUNCTIONS/__init_fltk__.cc
 #    }
 #}
 

Deleted: trunk/dports/math/octave-devel/files/patch-lo-specfun.cc.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-lo-specfun.cc.diff	2011-01-27 19:47:46 UTC (rev 75512)
+++ trunk/dports/math/octave-devel/files/patch-lo-specfun.cc.diff	2011-01-27 20:03:50 UTC (rev 75513)
@@ -1,15 +0,0 @@
---- liboctave/lo-specfun.cc
-+++ liboctave/lo-specfun.cc
-@@ -25,6 +25,12 @@
- #include <config.h>
- #endif
- 
-+#if !defined (_REENTRANT)
-+#define _REENTRANT
-+#endif
-+#include <cmath>
-+#undef _REENTRANT
-+
- #include "Range.h"
- #include "CColVector.h"
- #include "CMatrix.h"

    

michaelld＠macports.org

tags

participants (1)