[131503] trunk/dports/devel/ld64

[jeremyhu at macports.org]

Revision: 131503
          https://trac.macports.org/changeset/131503
Author:   jeremyhu at macports.org
Date:     2015-01-12 18:31:16 -0800 (Mon, 12 Jan 2015)
Log Message:
-----------
ld64: Remove unneeded include of Availability.h for Tiger builds (#46535)

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

Added Paths:
-----------
    trunk/dports/devel/ld64/files/ld64-97-no-Availability.h.patch

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2015-01-13 02:29:00 UTC (rev 131502)
+++ trunk/dports/devel/ld64/Portfile	2015-01-13 02:31:16 UTC (rev 131503)
@@ -31,11 +31,11 @@
 if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36]} {
     if {${os.major} >= 13} {
         default_variants +llvm35
-    } elseif {${os.major} >= 9} {
+    } else {
         default_variants +llvm34
     }
 
-    if {![variant_isset llvm34] && ![variant_isset llvm35] && ${os.major} >= 9} {
+    if {![variant_isset llvm34] && ![variant_isset llvm35]} {
         ui_error "Your platform cannot be configured without LTO support in ld64.  Please enable one of the llvmXX variants, and try again."
         return -code error "Your platform cannot be configured without LTO support in ld64.  Please enable one of the llvmXX variants, and try again."
     }
@@ -76,7 +76,7 @@
     depends_build-append    path:include/libunwind.h:libunwind-headers
 }
 
-if {${os.major} < 9} {
+if {${os.major} < 8} {
     # XCode 3.2.6
     version             97.17
     revision            4
@@ -87,7 +87,7 @@
     set makefile	"Makefile-97"
 
     patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch ld64-134-missing-include.patch ld64-136-i386-badAddress.patch PR-16935960.patch PR-16936488.patch
-    patchfiles-append   ld64-97-no-LTO.patch ld64-97-ppc-branch-island.patch ld64-97-arm_types_PR38931.patch ld64-97-long-branch-warn.patch ld64-97-standalone-libunwind-headers.patch
+    patchfiles-append   ld64-97-no-LTO.patch ld64-97-ppc-branch-island.patch ld64-97-arm_types_PR38931.patch ld64-97-long-branch-warn.patch ld64-97-standalone-libunwind-headers.patch ld64-97-no-Availability.h.patch
 } elseif {${os.major} < 10} {
     # XCode 4.2
     # This was the last ld64 release that supported linking ppc executables.
@@ -100,7 +100,7 @@
     set makefile	"Makefile-127"
 
     patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch ld64-136-i386-badAddress.patch PR-16935960.patch PR-16936488.patch
-    patchfiles-append   ld64-127-any-cctools.patch ld64-127-long-branch-warn.patch ld64-127-cxx_initializer_order_and_sim.patch ld64-127-ppc.patch
+    patchfiles-append   ld64-127-any-cctools.patch ld64-127-long-branch-warn.patch ld64-127-cxx_initializer_order_and_sim.patch ld64-127-ppc.patch ld64-97-no-Availability.h.patch
 } elseif {${os.major} < 11} {
     # XCode 4.6
     # Until we figure out a way to better bootstrap ld64-236 on SnowLeopard or fix its build failure

Added: trunk/dports/devel/ld64/files/ld64-97-no-Availability.h.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-97-no-Availability.h.patch	                        (rev 0)
+++ trunk/dports/devel/ld64/files/ld64-97-no-Availability.h.patch	2015-01-13 02:31:16 UTC (rev 131503)
@@ -0,0 +1,27 @@
+From 252fa112fb93f8e5fd9035e023bcd08adf55c833 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Mon, 12 Jan 2015 18:26:55 -0800
+Subject: [PATCH] Remove unused include of Availability.h
+
+http://trac.macports.org/ticket/46535
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ src/ld/parsers/libunwind/AddressSpace.hpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git src/ld/parsers/libunwind/AddressSpace.hpp src/ld/parsers/libunwind/AddressSpace.hpp
+index bebd3e6..4a42e73 100644
+--- src/ld/parsers/libunwind/AddressSpace.hpp
++++ src/ld/parsers/libunwind/AddressSpace.hpp
+@@ -37,7 +37,6 @@
+ #include <mach-o/getsect.h>
+ #include <mach-o/dyld_priv.h>
+ #include <mach/i386/thread_status.h>
+-#include <Availability.h>
+ 
+ #include "FileAbstraction.hpp"
+ #include "libunwind.h"
+-- 
+2.2.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150112/cc03be9c/attachment.html>