[131442] trunk/dports/devel/libunwind

[jeremyhu at macports.org]

Revision: 131442
          https://trac.macports.org/changeset/131442
Author:   jeremyhu at macports.org
Date:     2015-01-12 00:06:12 -0800 (Mon, 12 Jan 2015)
Log Message:
-----------
libunwind-headers: Followup fix for Tiger (#46529)

Modified Paths:
--------------
    trunk/dports/devel/libunwind/Portfile
    trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch

Modified: trunk/dports/devel/libunwind/Portfile
===================================================================
--- trunk/dports/devel/libunwind/Portfile	2015-01-12 07:59:44 UTC (rev 131441)
+++ trunk/dports/devel/libunwind/Portfile	2015-01-12 08:06:12 UTC (rev 131442)
@@ -6,7 +6,7 @@
 name                    libunwind
 version                 3.5.0
 revision                4
-subport ${name}-headers { revision 6 }
+subport ${name}-headers { revision 7 }
 epoch                   1
 categories              devel
 platforms               darwin

Modified: trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch	2015-01-12 07:59:44 UTC (rev 131441)
+++ trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch	2015-01-12 08:06:12 UTC (rev 131442)
@@ -1,4 +1,4 @@
-From 46135392a3ca41ad55572a6e721c71c8b7e4a6d1 Mon Sep 17 00:00:00 2001
+From 297eec69dc89073213afdb29cccfa68ea63428dd Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sun, 11 Jan 2015 19:24:43 -0800
 Subject: [PATCH 6/8] libunwind: Only include <Availability.h> on Leopard and
@@ -8,27 +8,25 @@
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 ---
- include/libunwind.h | 20 +++++++++++++++-----
+ include/libunwind.h | 22 ++++++++++++++++++----
  src/Unwind/config.h |  9 ++++++++-
- 2 files changed, 23 insertions(+), 6 deletions(-)
+ 2 files changed, 26 insertions(+), 5 deletions(-)
 
 diff --git a/include/libunwind.h b/include/libunwind.h
-index 448d86a..fbfc19b 100644
+index 448d86a..a5630a5 100644
 --- a/include/libunwind.h
 +++ b/include/libunwind.h
-@@ -26,12 +26,22 @@
+@@ -26,12 +26,26 @@
  #endif
  
  #if __APPLE__
 -  #include <Availability.h>
 -    #if __arm__
 -       #define LIBUNWIND_AVAIL __attribute__((unavailable))
--    #else
--      #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
 +  #if __clang__
 +    #if __has_include(<Availability.h>)
 +      #include <Availability.h>
-     #endif
++    #endif
 +  #elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
 +    #include <Availability.h>
 +  #endif
@@ -39,7 +37,12 @@
 +    #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
 +  #else
 +    #include <AvailabilityMacros.h>
-+    #define LIBUNWIND_AVAIL AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
++    #ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
++      #define LIBUNWIND_AVAIL AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+     #else
+-      #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
++      #define LIBUNWIND_AVAIL __attribute__((unavailable))
+     #endif
 +  #endif
  #else
    #define LIBUNWIND_AVAIL
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150112/5fca8613/attachment.html>