[131355] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Sat Jan 10 03:56:47 PST 2015


Revision: 131355
          https://trac.macports.org/changeset/131355
Author:   jeremyhu at macports.org
Date:     2015-01-10 03:56:47 -0800 (Sat, 10 Jan 2015)
Log Message:
-----------
clang-3.[56]: Steps towards getting working on Leopard, but not there yet

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.5/Portfile
    trunk/dports/lang/llvm-3.6/Portfile

Added Paths:
-----------
    trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
    trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch

Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile	2015-01-10 11:38:40 UTC (rev 131354)
+++ trunk/dports/lang/llvm-3.5/Portfile	2015-01-10 11:56:47 UTC (rev 131355)
@@ -128,6 +128,7 @@
                          0001-PR21536-Fix-a-corner-case-where-we-d-get-confused-by.patch \
                          0002-PR19372-Keep-checking-template-arguments-after-we-se.patch \
                          0001-Comment-out-SL-cctools-workaround.patch \
+                         0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
                          clang-format.patch \
                          clang-modernize.patch \
                          snowleopard-cmath.patch \

Added: trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-01-10 11:56:47 UTC (rev 131355)
@@ -0,0 +1,28 @@
+From c6dc32fab57dc55f266c6a7dbc0b4ccbf84f75f7 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 10 Jan 2015 03:34:51 -0800
+Subject: [PATCH] Update CheckArches to fallback on Intel/ppc if ld -v doesn't
+ report supported architectures
+
+Older versions of ld64 (eg: Xcode 3.x) do not report this.
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22182
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
+index 6f62170..0120547 100644
+--- a/projects/compiler-rt/make/platform/clang_darwin.mk
++++ b/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -20,6 +20,8 @@ CheckArches = \
+         if $(LD) -v 2>&1 | grep "configured to support" \
+            | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
+           result="$$result$$arch "; \
++        elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
++          result="$$result$$arch "; \
+         else \
+           printf 1>&2 \
+             "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'"; \

Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile	2015-01-10 11:38:40 UTC (rev 131354)
+++ trunk/dports/lang/llvm-3.6/Portfile	2015-01-10 11:56:47 UTC (rev 131355)
@@ -106,6 +106,7 @@
 } elseif {${subport} eq "clang-${llvm_version}"} {
     patchfiles-append    scan-build-PR-35006.patch \
                          0001-Comment-out-SL-cctools-workaround.patch \
+                         0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
                          clang-format.patch \
                          clang-modernize.patch \
                          snowleopard-cmath.patch \

Added: trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-01-10 11:56:47 UTC (rev 131355)
@@ -0,0 +1,31 @@
+From c6dc32fab57dc55f266c6a7dbc0b4ccbf84f75f7 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 10 Jan 2015 03:34:51 -0800
+Subject: [PATCH] Update CheckArches to fallback on Intel/ppc if ld -v doesn't
+ report supported architectures
+
+Older versions of ld64 (eg: Xcode 3.x) do not report this.
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22182
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
+index 6f62170..0120547 100644
+--- a/projects/compiler-rt/make/platform/clang_darwin.mk
++++ b/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -25,6 +25,8 @@ CheckArches = \
+           if $(LD) -v 2>&1 | grep "configured to support" \
+              | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
+             result="$$result$$arch "; \
++          elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
++            result="$$result$$arch "; \
+           else \
+             printf 1>&2 \
+             "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
+-- 
+2.2.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150110/55ba5407/attachment.html>


More information about the macports-changes mailing list