Revision: 91473 https://trac.macports.org/changeset/91473 Author: jeremyhu@macports.org Date: 2012-04-02 14:43:58 -0700 (Mon, 02 Apr 2012) Log Message: ----------- dragonegg-*: Support building +universal Modified Paths: -------------- trunk/dports/lang/dragonegg-3.0/Portfile trunk/dports/lang/dragonegg-3.1/Portfile Modified: trunk/dports/lang/dragonegg-3.0/Portfile =================================================================== --- trunk/dports/lang/dragonegg-3.0/Portfile 2012-04-02 21:23:45 UTC (rev 91472) +++ trunk/dports/lang/dragonegg-3.0/Portfile 2012-04-02 21:43:58 UTC (rev 91473) @@ -8,7 +8,7 @@ name dragonegg-${llvm_version} set gcc_version 46 set gcc_version_dot 4.6 -revision 2 +revision 3 dist_subdir llvm categories lang platforms darwin @@ -25,6 +25,10 @@ depends_lib port:llvm-${llvm_version} port:gcc${gcc_version} depends_run port:gcc_select +# gcc needs to match our arch, not the other way around +# We build +universal just fine in order to support whatever arch gcc is +depends_skip_archcheck-append gcc${gcc_version} + #fetch.type svn #svn.revision 146339 #version ${llvm_version}-r${svn.revision} @@ -55,11 +59,27 @@ build.target +# g++-4.0 fails to build some of the newer C++ for ppc +# Intel looks ok, but I prefer using gcc-4.2 for consistency +if {${configure.compiler} == "gcc-4.0"} { + configure.compiler gcc-4.2 + if {![file exists ${configure.cc}]} { + depends_build-append port:apple-gcc42 + configure.compiler apple-gcc-4.2 + } +} + +variant universal { + post-patch { + reinplace "/-MD -MP/d" ${worksrcpath}/Makefile + } +} + build.env-append \ LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version} \ GCC=${prefix}/bin/gcc-mp-${gcc_version_dot} \ - CC="${configure.cc} ${configure.cppflags}" \ - CXX="${configure.cxx} ${configure.cppflags}" + CC="${configure.cc} ${configure.cppflags} [get_canonical_archflags cc]" \ + CXX="${configure.cxx} ${configure.cppflags} [get_canonical_archflags cxx]" destroot { xinstall -m 755 -d ${destroot}${prefix}/libexec/dragonegg Modified: trunk/dports/lang/dragonegg-3.1/Portfile =================================================================== --- trunk/dports/lang/dragonegg-3.1/Portfile 2012-04-02 21:23:45 UTC (rev 91472) +++ trunk/dports/lang/dragonegg-3.1/Portfile 2012-04-02 21:43:58 UTC (rev 91473) @@ -8,6 +8,7 @@ name dragonegg-${llvm_version} set gcc_version 46 set gcc_version_dot 4.6 +revision 1 dist_subdir llvm categories lang platforms darwin @@ -24,6 +25,10 @@ depends_lib port:llvm-${llvm_version} port:gcc${gcc_version} depends_run port:gcc_select +# gcc needs to match our arch, not the other way around +# We build +universal just fine in order to support whatever arch gcc is +depends_skip_archcheck-append gcc${gcc_version} + fetch.type svn svn.revision 153754 version ${llvm_version}-r${svn.revision} @@ -51,11 +56,30 @@ build.target +# g++-4.0 fails to build some of the newer C++ for ppc +# Intel looks ok, but I prefer using gcc-4.2 for consistency +if {${configure.compiler} == "gcc-4.0"} { + configure.compiler gcc-4.2 + if {![file exists ${configure.cc}]} { + depends_build-append port:apple-gcc42 + configure.compiler apple-gcc-4.2 + } +} + +# linking fails for ppc +supported_archs i386 x86_64 + +variant universal { + post-patch { + reinplace "/-MD -MP/d" ${worksrcpath}/Makefile + } +} + build.env-append \ LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version} \ GCC=${prefix}/bin/gcc-mp-${gcc_version_dot} \ - CC="${configure.cc} ${configure.cppflags}" \ - CXX="${configure.cxx} ${configure.cppflags}" + CC="${configure.cc} ${configure.cppflags} [get_canonical_archflags cc]" \ + CXX="${configure.cxx} ${configure.cppflags} [get_canonical_archflags cxx]" destroot { xinstall -m 755 -d ${destroot}${prefix}/libexec/dragonegg