Revision: 130525 https://trac.macports.org/changeset/130525 Author: jeremyhu@macports.org Date: 2014-12-31 00:23:02 -0800 (Wed, 31 Dec 2014) Log Message: ----------- guile: universal_variant no Modified Paths: -------------- trunk/dports/lang/guile/Portfile Modified: trunk/dports/lang/guile/Portfile =================================================================== --- trunk/dports/lang/guile/Portfile 2014-12-31 08:05:23 UTC (rev 130524) +++ trunk/dports/lang/guile/Portfile 2014-12-31 08:23:02 UTC (rev 130525) @@ -2,7 +2,7 @@ # $Id$ PortSystem 1.0 -PortGroup muniversal 1.0 +#PortGroup muniversal 1.0 name guile version 2.0.11 @@ -12,6 +12,9 @@ platforms darwin license LGPL-2.1+ +# Failed to destroot guile: /opt/local/lib/guile/2.0/ccache/ice-9/and-let-star.go differs in ... and cannot be merged +universal_variant no + description GNU's Ubiquitous Intelligent Language for Extension (guile) long_description \ Guile is an interpreter for the Scheme programming \ @@ -73,16 +76,17 @@ } platform darwin { - if {[variant_isset universal]} { - set merger_host(x86_64) x86_64-apple-${os.platform}${os.major} - set merger_host(i386) i686-apple-${os.platform}${os.major} - set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major} - set merger_host(ppc) powerpc-apple-${os.platform}${os.major} - set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major}" - set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}" - set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}" - set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}" - } elseif {${build_arch} eq "i386"} { +# if {[variant_isset universal]} { +# set merger_host(x86_64) x86_64-apple-${os.platform}${os.major} +# set merger_host(i386) i686-apple-${os.platform}${os.major} +# set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major} +# set merger_host(ppc) powerpc-apple-${os.platform}${os.major} +# set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major}" +# set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}" +# set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}" +# set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}" +# } else + if {${build_arch} eq "i386"} { configure.args-append \ --host=i686-apple-${os.platform}${os.major} \ --build=i686-apple-${os.platform}${os.major}