[125857] trunk/dports/math
takeshi at macports.org
takeshi at macports.org
Sat Sep 27 23:45:05 PDT 2014
Revision: 125857
https://trac.macports.org/changeset/125857
Author: takeshi at macports.org
Date: 2014-09-27 23:45:05 -0700 (Sat, 27 Sep 2014)
Log Message:
-----------
dotwrp: made obsolete. replaced by vecLibFort. octave, qrupdate: use vecLibFort in accelerate variant, closing #44991.
Modified Paths:
--------------
trunk/dports/math/dotwrp/Portfile
trunk/dports/math/octave/Portfile
trunk/dports/math/qrupdate/Portfile
Modified: trunk/dports/math/dotwrp/Portfile
===================================================================
--- trunk/dports/math/dotwrp/Portfile 2014-09-28 06:02:41 UTC (rev 125856)
+++ trunk/dports/math/dotwrp/Portfile 2014-09-28 06:45:05 UTC (rev 125857)
@@ -2,97 +2,13 @@
# $Id$
PortSystem 1.0
-PortGroup github 1.0
-github.setup tenomoto dotwrp 1.1 v
-revision 3
+# This port can be removed after 28 September 2015
+replaced_by vecLibFort
+PortGroup obsolete 1.0
+
+name dotwrp
+version 2.0
+homepage https://github.com/tenomoto/dotwrp
categories math science
-platforms darwin
-maintainers takeshi
license public-domain
-description A wrapper for *dot* functions in Accelerate framework
-long_description \
- This is a wrapper for four Level 1 BLAS functions \
- CDOTC CDOTU ZDOTC ZDOTU and SDOT in Accelerate.framework \
- of Mac OS X.
-
-checksums rmd160 c9aa3d56d6d01c7b198a100544e6a84748022405 \
- sha256 7ffa40d6a3564829a85757af200c9fd71482cf729a266a23b4775997450d7397
-
-use_configure no
-
-configure.fflags-append -fno-underscoring
-build {
- system "cd ${worksrcpath};
- ${configure.fc} ${configure.fflags} -c ${name}.f90;
- /usr/bin/ar -cru lib${name}.a ${name}.o;
- /usr/bin/ranlib lib${name}.a"
-}
-
-destroot {
- xinstall -m 644 ${worksrcpath}/lib${name}.a ${destroot}${prefix}/lib
-}
-
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
-set g95_conflicts {}
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
-
- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
- continue
- }
-
- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
- }
- append variant_line { {}}
-
- eval $variant_line
-
- append g95_conflicts " conflicts gcc${ver_no_dot}"
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
- }
- }
-}
-
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-if {[variant_isset g95]} {
- if {${default_fortran_variant} != "+g95"} {
- set default_fortran_variant ""
- }
-}
-
-if {${default_fortran_variant} != ""} {
- default_variants-append "${default_fortran_variant}"
-}
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- if {[variant_isset gcc${ver_no_dot}]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc${ver_no_dot}
-
- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver}
- }
-}
-
-if {[variant_isset g95]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:g95
-
- configure.fc ${prefix}/bin/g95
- configure.f77 ${prefix}/bin/g95
- configure.f90 ${prefix}/bin/g95
-}
Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile 2014-09-28 06:02:41 UTC (rev 125856)
+++ trunk/dports/math/octave/Portfile 2014-09-28 06:45:05 UTC (rev 125857)
@@ -9,6 +9,7 @@
name octave
version 3.8.2
+revision 1
#conflicts octave-devel
categories math science
maintainers michaelld openmaintainer
@@ -156,9 +157,9 @@
if {[variant_isset accelerate]} {
- depends_lib-append port:dotwrp
+ depends_lib-append port:vecLibFort
configure.args-append \
- --with-blas="-ldotwrp -Wl,-framework -Wl,Accelerate" \
+ --with-blas=-lvecLibFort \
--with-lapack="-Wl,-framework -Wl,Accelerate"
} else {
Modified: trunk/dports/math/qrupdate/Portfile
===================================================================
--- trunk/dports/math/qrupdate/Portfile 2014-09-28 06:02:41 UTC (rev 125856)
+++ trunk/dports/math/qrupdate/Portfile 2014-09-28 06:45:05 UTC (rev 125857)
@@ -3,10 +3,14 @@
PortSystem 1.0
PortGroup muniversal 1.0
+PortGroup compilers 1.0
+compilers.choose fc
+compilers.setup require_fortran -dragonegg
+
name qrupdate
version 1.1.2
-revision 2
+revision 3
# upstream follows a weird folder naming policy, we need last two digits of version separated by a dot
set branch [join [lrange [split ${version} .] 1 2] .]
categories math
@@ -63,77 +67,32 @@
}
}
-variant atlas description {build with atlas instead of Accelerate framework} {
+variant atlas conflicts accelerate description {build with atlas instead of Accelerate framework} {
depends_lib-append port:atlas
build.args-append BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack"
destroot.args-append BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack"
test.args-append BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack"
}
-if {![variant_isset atlas]} {
- build.args-append BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
- destroot.args-append BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
- test.args-append BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
-}
-if {[variant_isset g95]} {
- default_variants -atlas
-} else {
- default_variants +atlas
+variant accelerate conflicts atlas description {build with Accelerate framework} {
+ depends_lib-append port:vecLibFort
+ build.args-append BLAS=-lvecLibFort LAPACK="-framework Accelerate"
+ destroot.args-append BLAS=-lvecLibFort LAPACK="-framework Accelerate"
+ test.args-append BLAS=-lvecLibFort LAPACK="-framework Accelerate"
}
-
-variant g95 conflicts gcc45 gcc46 gcc47 gcc48 gcc49 universal description {build with g95} {
- depends_build-append port:g95
+if {[variant_isset g95]} {
+ default_variants-append +accelerate
post-patch {
reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile
reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/src/Makefile
}
-}
-
-variant gcc45 conflicts g95 gcc46 gcc47 gcc48 gcc49 universal description {build with gcc45 fortran} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc45
+} else {
+ default_variants-append +atlas
post-patch {
- reinplace "s|gfortran|gfortran-mp-4.5|" ${worksrcpath}/Makeconf
+ reinplace "s|gfortran|${configure.fc}|" ${worksrcpath}/Makeconf
}
}
-
-variant gcc46 conflicts g95 gcc45 gcc47 gcc48 gcc49 description {build with gcc46 fortran} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc46
- post-patch {
- reinplace "s|gfortran|gfortran-mp-4.6|" ${worksrcpath}/Makeconf
- }
-}
-
-variant gcc47 conflicts g95 gcc45 gcc46 gcc48 gcc49 description {build with gcc47 fortran} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc47
- post-patch {
- reinplace "s|gfortran|gfortran-mp-4.7|" ${worksrcpath}/Makeconf
- }
-}
-
-variant gcc48 conflicts g95 gcc45 gcc46 gcc47 gcc49 description {build with gcc48 fortran} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc48
- post-patch {
- reinplace "s|gfortran|gfortran-mp-4.8|" ${worksrcpath}/Makeconf
- }
-}
-
-variant gcc49 conflicts g95 gcc45 gcc46 gcc47 gcc48 description {build with gcc49 fortran} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc49
- post-patch {
- reinplace "s|gfortran|gfortran-mp-4.9|" ${worksrcpath}/Makeconf
- }
-}
-
-if {![variant_isset g95] && ![variant_isset gcc45] && \
- ![variant_isset gcc46] && ![variant_isset gcc47] && \
- ![variant_isset gcc48] && ![variant_isset gcc49]} {
+if {![fortran_variant_isset]} {
default_variants-append +gcc48
}
-
-test.run yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140927/1bb780be/attachment.html>
More information about the macports-changes
mailing list