Revision: 112789 https://trac.macports.org/changeset/112789 Author: takeshi@macports.org Date: 2013-11-01 07:27:26 -0700 (Fri, 01 Nov 2013) Log Message: ----------- fortrancl: updated for 0.1alpha4. Provide Fortran variants following PortfileRecipes#fortran. Modified Paths: -------------- trunk/dports/devel/fortrancl/Portfile trunk/dports/devel/fortrancl/files/patch-fortrancl.pc.in.diff Modified: trunk/dports/devel/fortrancl/Portfile =================================================================== --- trunk/dports/devel/fortrancl/Portfile 2013-11-01 14:25:46 UTC (rev 112788) +++ trunk/dports/devel/fortrancl/Portfile 2013-11-01 14:27:26 UTC (rev 112789) @@ -5,8 +5,7 @@ PortGroup muniversal 1.0 name fortrancl -version 0.1alpha3 -revision 3 +version 0.1alpha4 categories devel parallel science platforms darwin license LGPL @@ -20,8 +19,8 @@ homepage http://code.google.com/p/fortrancl/ master_sites googlecode -checksums rmd160 4919f317f0f64bd730a9c045c454e4c08d602ff8 \ - sha256 4d99864b8d9c10d13e4047a2016d16fd78e96e0744b29c36c442636a3ef1d3b8 +checksums rmd160 a709df9ffb914e9e37605dd5a800a58d1567f800 \ + sha256 55d604a8659edbb0bc6fe9318c1bf04898c93fefcd0bbd03c62ddb778e167581 pre-fetch { if {${os.major} < 10} { @@ -34,6 +33,8 @@ configure.cppflags-append -framework OpenCL configure.args --enable-shared +use_parallel_build no + post-destroot { xinstall -d -m 755 ${destroot}${prefix}/share/${name}/examples xinstall -m 644 -W ${worksrcpath}/examples \ @@ -41,29 +42,68 @@ ${destroot}${prefix}/share/${name}/examples/ } -if {![variant_isset g95] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc48]} { - default_variants +gcc47 -} +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 {} -variant gcc45 conflicts g95 gcc46 gcc47 gcc48 description {build with gfortran-mp-4.5} { - configure.compiler macports-gcc-4.5 +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 "" + } + } } -variant gcc46 conflicts g95 gcc45 gcc47 gcc48 description {build with gfortran-mp-4.6} { - configure.compiler macports-gcc-4.6 +eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}] + +if {[variant_isset g95]} { + if {${default_fortran_variant} != "+g95"} { + set default_fortran_variant "" + } } -variant gcc47 conflicts g95 gcc45 gcc46 gcc48 description {build with gfortran-mp-4.7} { - configure.compiler macports-gcc-4.7 +if {${default_fortran_variant} != ""} { + default_variants-append "${default_fortran_variant}" } -variant gcc48 conflicts g95 gcc45 gcc46 gcc47 description {build with gfortran-mp-4.8} { - configure.compiler macports-gcc-4.8 +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} + } } -variant g95 conflicts gcc45 gcc46 gcc47 gcc48 description {build with g95} { - depends_build-append port:g95 - configure.fc g95 +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 } # They differ when universal due to gcc multilib being messy non-universal Modified: trunk/dports/devel/fortrancl/files/patch-fortrancl.pc.in.diff =================================================================== --- trunk/dports/devel/fortrancl/files/patch-fortrancl.pc.in.diff 2013-11-01 14:25:46 UTC (rev 112788) +++ trunk/dports/devel/fortrancl/files/patch-fortrancl.pc.in.diff 2013-11-01 14:27:26 UTC (rev 112789) @@ -1,6 +1,6 @@ ---- fortrancl.pc.in.orig 2012-01-20 20:56:49.000000000 +0900 -+++ fortrancl.pc.in 2013-07-14 07:54:34.000000000 +0900 -@@ -9,25 +9,3 @@ +--- fortrancl.pc.in.orig 2012-04-03 20:53:20.000000000 +0900 ++++ fortrancl.pc.in 2013-10-31 21:13:59.000000000 +0900 +@@ -4,7 +4,3 @@ URL: @PACKAGE_URL@ Libs: -L${libdir} -lfortrancl Cflags: -I${includedir}/fortrancl @@ -8,21 +8,3 @@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -- --Name: @PACKAGE_NAME@ --Description: OpenCL interface for Fortran 90 --Version: @PACKAGE_VERSION@ --URL: @PACKAGE_URL@ --Libs: -L${libdir} -lfortrancl --Cflags: -I${includedir}/fortrancl --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -- --Name: @PACKAGE_NAME@ --Description: OpenCL interface for Fortran 90 --Version: @PACKAGE_VERSION@ --URL: @PACKAGE_URL@ --Libs: -L${libdir} -lfortrancl --Cflags: -I${includedir}/fortrancl
participants (1)
-
takeshi@macports.org