[92829] trunk/dports

adfernandes at macports.org adfernandes at macports.org
Tue May 8 08:35:25 PDT 2012


Revision: 92829
          https://trac.macports.org/changeset/92829
Author:   adfernandes at macports.org
Date:     2012-05-08 08:35:23 -0700 (Tue, 08 May 2012)
Log Message:
-----------
Update devel/ppl and devel/cloog, obsolete devel/cloog-ppl, enable graphite by default for gcc46 and gcc47; note cloog-0.16.3 is the most recent that is compatible with gcc; cloog-0.17 is not; closes #34010 and #33635

Modified Paths:
--------------
    trunk/dports/devel/cloog/Portfile
    trunk/dports/devel/cloog-ppl/Portfile
    trunk/dports/devel/ppl/Portfile
    trunk/dports/lang/gcc46/Portfile
    trunk/dports/lang/gcc47/Portfile

Modified: trunk/dports/devel/cloog/Portfile
===================================================================
--- trunk/dports/devel/cloog/Portfile	2012-05-08 07:50:39 UTC (rev 92828)
+++ trunk/dports/devel/cloog/Portfile	2012-05-08 15:35:23 UTC (rev 92829)
@@ -1,5 +1,6 @@
 # $Id$
 PortSystem          1.0
+PortGroup           muniversal 1.0
 
 name                cloog
 version             0.16.3

Modified: trunk/dports/devel/cloog-ppl/Portfile
===================================================================
--- trunk/dports/devel/cloog-ppl/Portfile	2012-05-08 07:50:39 UTC (rev 92828)
+++ trunk/dports/devel/cloog-ppl/Portfile	2012-05-08 15:35:23 UTC (rev 92829)
@@ -1,11 +1,13 @@
 # $Id$
 PortSystem          1.0
+PortGroup           muniversal 1.0
 
 name                cloog-ppl
 version             0.15.11
+revision            1
 categories          devel math
 
-conflicts           cloog
+replaced_by         cloog
 
 maintainers         openmaintainer adfernandes
 platforms           darwin
@@ -22,21 +24,26 @@
                     help in any situation where scanning polyhedra matters. While the user \
                     has full control on generated code quality, CLooG is designed to avoid \
                     control overhead and to produce a very effective code.
-
+distfiles
 homepage            http://repo.or.cz/w/cloog-ppl.git
-master_sites        ftp://gcc.gnu.org/pub/gcc/infrastructure/ \
-                    http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/infrastructure/
+# master_sites        ftp://gcc.gnu.org/pub/gcc/infrastructure/ \
+#                     http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/infrastructure/
 
-checksums           md5     060ae4df6fb8176e021b4d033a6c0b9e \
-                    sha1    42fa476a79a1d52da41608a946dcb47c70f7e3b9 \
-                    rmd160  e67b3e72fadf94afc53de7c17b40db76eb00bce2
+# checksums           md5     060ae4df6fb8176e021b4d033a6c0b9e \
+#                     sha1    42fa476a79a1d52da41608a946dcb47c70f7e3b9 \
+#                     rmd160  e67b3e72fadf94afc53de7c17b40db76eb00bce2
 
-depends_lib         port:ppl
+# depends_lib         port:gmp port:ppl
 
                     # The 'ppl' port is needed so that 'cloog' can be used with 'gcc45+'. We
                     # don't use a variant since there's no way to guarantee a variant is set.
-configure.args      --with-ppl=${prefix}
+# configure.args      --with-ppl=${prefix}
 
-livecheck.type      regex
-livecheck.url       [lindex ${master_sites} 0]
-livecheck.regex     ${name}-(\[0-9.\]+)\\.tar.gz
+livecheck.type      none
+# livecheck.url       [lindex ${master_sites} 0]
+# livecheck.regex     ${name}-(\[0-9.\]+)\\.tar.gz
+
+pre-configure {
+    ui_error "Please do not install this port since it has been replaced by 'cloog'."
+    return -code error
+}

Modified: trunk/dports/devel/ppl/Portfile
===================================================================
--- trunk/dports/devel/ppl/Portfile	2012-05-08 07:50:39 UTC (rev 92828)
+++ trunk/dports/devel/ppl/Portfile	2012-05-08 15:35:23 UTC (rev 92829)
@@ -5,7 +5,7 @@
 PortGroup           muniversal 1.0
 
 name                ppl
-version             0.11.2
+version             0.12.1
 revision            1
 categories          devel math
 platforms           darwin
@@ -28,83 +28,18 @@
                     and linear programming problems solved with an \
                     exact-arithmetic version of the simplex algorithm.
 
-homepage            http://www.cs.unipr.it/ppl/
+homepage            http://bugseng.com/products/ppl/
 master_sites        http://www.cs.unipr.it/ppl/Download/ftp/releases/${version}/ \
                     ftp://ftp.cs.unipr.it/pub/ppl/releases/${version}/
 use_bzip2           yes
 
-checksums           md5     c24429e6c3bc97d45976a63f40f489a1 \
-                    sha1    915f1d8a7def10e540bf2806babf94dccd15852a \
-                    rmd160  68dd335f6e94df09ac4e19ccf08f1c1b280efe86
+checksums           md5     8da3ab9de18e669b7af8c4707817d468 \
+                    sha1    1eb8c59e1d7f50899275067e2d46e65122550950 \
+                    rmd160  4ae199d64c6b7c63a78865671eefacdeed46009d
 
-patchfiles          configure-crosscompile.patch
-
 depends_build       port:m4
+depends_lib         port:gmp
 
-depends_lib         port:gmp \
-                    port:glpk
-
-variant gcc43 conflicts gcc44 description "Use GCC 4.3 for compilation of PPL" {
-    depends_build-append        port:gcc43
-    configure.compiler          macports-gcc-4.3
-    configure.cflags-append     "-ftree-vectorize -O3 -march=native"
-}
-
-variant gcc44 conflicts gcc43 description "Use GCC 4.4 for compilation of PPL" {
-    depends_build-append        port:gcc44
-    configure.compiler          macports-gcc-4.4
-    configure.cflags-append     "-ftree-vectorize -O3 -march=native"
-}
-
-#variant gcc45 conflicts gcc43 gcc44 gcc46 description "Use GCC 4.5 for compilation of PPL" {
-#    depends_build-append        port:gcc45
-#    configure.compiler          macports-gcc-4.5
-#    configure.cflags-append     "-ftree-vectorize -O3 -march=native"
-#}
-
-#variant gcc46 conflicts gcc43 gcc44 gcc45 description "Use GCC 4.6 for compilation of PPL" {
-#    depends_build-append        port:gcc46
-#    configure.compiler          macports-gcc-4.6
-#    configure.cflags-append     "-ftree-vectorize -O3 -march=native"
-#}
-
-if { ${os.arch} == "i386" } {
-    set native_target {i386 x86_64}
-} else {
-    set native_target {ppc ppc64}
-}
-
-if { [variant_isset universal] } {
-    configure.cflags-delete -march=native
-    configure.args-append   --build=${build_arch}-apple-${os.platform}${os.version}
-
-    foreach arch ${universal_archs_supported} {
-        lappend merger_configure_args($arch)    --host=${arch}-apple-${os.platform}${os.version}
-    }
-    foreach arch ${native_target} {
-        if { [variant_isset gcc43] || [variant_isset gcc44] } {
-            lappend merger_configure_cflags($arch)  -march=native
-        }
-    }
-}
-
-platform i386 {
-    if { [variant_isset gcc43] || [variant_isset gcc44] } {
-        configure.cflags-append     -mno-avx
-        configure.cxxflags-append   -mno-avx
-    }
-}
-
-post-patch {
-    # Newer clang will error about this being unsupported due to -Werror
-    # Older clang will just warn despite -Werror
-    # llvm-gcc doesn't support it and just doesn't tell you about it
-    if {[string match "*clang*" ${configure.compiler}] ||
-        [string match "*llvm-gcc*" ${configure.compiler}]} {
-        reinplace "s|-frounding-math||" ${worksrcpath}/configure
-    }
-}
-
 test.run            yes
 test.target         check
 

Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile	2012-05-08 07:50:39 UTC (rev 92828)
+++ trunk/dports/lang/gcc46/Portfile	2012-05-08 15:35:23 UTC (rev 92829)
@@ -4,9 +4,8 @@
 PortGroup select 1.0
 
 name                gcc46
-epoch               1
 version             4.6.3
-revision            1
+revision            2
 platforms           darwin
 categories          lang
 maintainers         mww openmaintainer
@@ -45,7 +44,7 @@
                     rmd160  d3f4da657f086b6423f74e93f001132f4855368a \
                     sha256  98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
 
-depends_lib         port:gmp port:mpfr port:libiconv port:libmpc port:ppl
+depends_lib         port:gmp port:mpfr port:libiconv port:libmpc port:ppl port:cloog
 depends_run         port:gcc_select port:ld64 port:cctools
 
 depends_skip_archcheck-append gcc_select ld64 cctools
@@ -81,6 +80,7 @@
                     --with-mpfr=${prefix} \
                     --with-mpc=${prefix} \
                     --with-ppl=${prefix} \
+                    --with-cloog=${prefix} --enable-cloog-backend=isl \
                     --enable-stage1-checking \
                     --disable-multilib \
                     --enable-lto \
@@ -153,11 +153,6 @@
 configure.universal_ldflags
 configure.universal_args
 
-variant cloog description {enable the CLOOG Graphite loop optimizations} {
-    configure.args-append   --with-cloog=${prefix} --enable-cloog-backend=isl
-    depends_lib-append      port:cloog
-}
-
 livecheck.type      regex
 livecheck.url       http://gcc.gnu.org/gcc-4.6/
 livecheck.regex     GCC (4\\.6\\.\[0-9\])

Modified: trunk/dports/lang/gcc47/Portfile
===================================================================
--- trunk/dports/lang/gcc47/Portfile	2012-05-08 07:50:39 UTC (rev 92828)
+++ trunk/dports/lang/gcc47/Portfile	2012-05-08 15:35:23 UTC (rev 92829)
@@ -4,9 +4,8 @@
 PortGroup select 1.0
 
 name                gcc47
-epoch               1
 version             4.7.0
-revision            2
+revision            3
 platforms           darwin
 categories          lang
 maintainers         mww openmaintainer
@@ -44,7 +43,7 @@
                     rmd160  d3f4da657f086b6423f74e93f001132f4855368a \
                     sha256  98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
 
-depends_lib         port:gmp port:mpfr port:libiconv port:libmpc port:ppl
+depends_lib         port:gmp port:mpfr port:libiconv port:libmpc port:ppl port:cloog
 depends_run         port:gcc_select port:ld64 port:cctools
 
 depends_skip_archcheck-append gcc_select ld64 cctools
@@ -79,6 +78,7 @@
                     --with-mpfr=${prefix} \
                     --with-mpc=${prefix} \
                     --with-ppl=${prefix} \
+                    --with-cloog=${prefix} --enable-cloog-backend=isl \
                     --enable-stage1-checking \
                     --disable-multilib \
                     --enable-lto \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120508/ae6487aa/attachment.html>


More information about the macports-changes mailing list