[102122] trunk/dports/devel/libgcrypt/Portfile

jeremyhu at macports.org jeremyhu at macports.org
Mon Jan 28 00:24:20 PST 2013


Revision: 102122
          https://trac.macports.org/changeset/102122
Author:   jeremyhu at macports.org
Date:     2013-01-28 00:24:20 -0800 (Mon, 28 Jan 2013)
Log Message:
-----------
libgcrypt: Use compiler.blacklist

Modified Paths:
--------------
    trunk/dports/devel/libgcrypt/Portfile

Modified: trunk/dports/devel/libgcrypt/Portfile
===================================================================
--- trunk/dports/devel/libgcrypt/Portfile	2013-01-28 08:19:56 UTC (rev 102121)
+++ trunk/dports/devel/libgcrypt/Portfile	2013-01-28 08:24:20 UTC (rev 102122)
@@ -39,34 +39,18 @@
 # Build fix for compilers that default to c99 (clang)
 configure.cflags-append "-std=gnu89"
 
-if {[string match "*gcc-4.2" ${configure.compiler}] ||
-    (${configure.compiler} == "gcc-4.0" && [vercmp ${xcodeversion} 3.0] >= 0)} {
-    # Some versions of gcc fail to build this for i386 including:
-    #     gcc-4.0 from XCode 3.1.6 (5493) -- Note that gcc-4.0 from XCode 2.5 (5370) works 
-    #     gcc-4.2 from XCode 3.1.6 (5577)
-    #     gcc-4.2 from XCode 3.2.6 (5666.3)
-    # rijndael.c: In function 'do_aesni_ctr':
-    # rijndael.c:895: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
-    # rijndael.c:895: error: 'asm' operand has impossible constraints
-    configure.compiler llvm-gcc-4.2
-
-    if {(![file exists ${configure.cc}]) && ([variant_isset universal] || ${build_arch} == "i386")} {
-        depends_build port:clang-3.0
-        depends_skip_archcheck-append clang-3.0
-
-        if {[variant_isset universal]} {
-            # In order to build universal on Leopard, you need MacPorts 2.1
-            set merger_configure_compiler(i386) macports-clang-3.0
-            lappend merger_configure_cflags(i386) -fheinous-gnu-extensions
-        } else {
-            # configure.compiler macports-clang-3.0 is not available in macports 2.0.4
-            # configure.compiler macports-clang-3.0
-            configure.cc    ${prefix}/bin/clang-mp-3.0
-            configure.objc  ${prefix}/bin/clang-mp-3.0
-            configure.cxx   ${prefix}/bin/clang++-mp-3.0
-            configure.cflags-append "-fheinous-gnu-extensions"
-        }
+# Some versions of gcc fail to build this for i386 including:
+#     gcc-4.0 from XCode 3.1.6 (5493) -- Note that gcc-4.0 from XCode 2.5 (5370) works 
+#     gcc-4.2 from XCode 3.1.6 (5577)
+#     gcc-4.2 from XCode 3.2.6 (5666.3)
+# rijndael.c: In function 'do_aesni_ctr':
+# rijndael.c:895: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
+# rijndael.c:895: error: 'asm' operand has impossible constraints
+if {${build_arch} == "i386" || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1)} {
+    if {[vercmp ${xcodeversion} 3.0] >= 0} {
+        compiler.blacklist-append gcc-4.0
     }
+    compiler.blacklist-append gcc-4.2
 }
 
 if {[string match "*clang*" ${configure.compiler}]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130128/b6a574fb/attachment-0001.html>


More information about the macports-changes mailing list