[142797] trunk/dports/devel/libunwind

jeremyhu at macports.org jeremyhu at macports.org
Sat Dec 12 07:16:36 PST 2015 

Revision: 142797
          https://trac.macports.org/changeset/142797
Author:   jeremyhu at macports.org
Date:     2015-11-23 09:11:50 -0800 (Mon, 23 Nov 2015)
Log Message:
-----------
libunwind: Address a potential build failure (#49779)

Modified Paths:
--------------
    trunk/dports/devel/libunwind/Portfile
    trunk/dports/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch
    trunk/dports/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch
    trunk/dports/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch
    trunk/dports/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch
    trunk/dports/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch
    trunk/dports/devel/libunwind/files/0006-MacPorts-Makefile.patch
    trunk/dports/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch
    trunk/dports/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch

Added Paths:
-----------
    trunk/dports/devel/libunwind/files/0009-libunwind-Remove-unused-includes.patch

Modified: trunk/dports/devel/libunwind/Portfile
===================================================================
--- trunk/dports/devel/libunwind/Portfile	2015-11-23 16:58:47 UTC (rev 142796)
+++ trunk/dports/devel/libunwind/Portfile	2015-11-23 17:11:50 UTC (rev 142797)
@@ -39,7 +39,8 @@
     0005-libunwind-MacPorts-availability.patch \
     0006-MacPorts-Makefile.patch \
     0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch \
-    0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch
+    0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch \
+    0009-libunwind-Remove-unused-includes.patch
 
 post-patch {
     if {${os.major} < 9} {

Modified: trunk/dports/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch	2015-11-23 16:58:47 UTC (rev 142796)
+++ trunk/dports/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch	2015-11-23 17:11:50 UTC (rev 142797)
@@ -1,7 +1,7 @@
 From 54a1dd57e9f610addbe8b48ad3bce36b71fdeff6 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sun, 11 Jan 2015 14:28:08 -0800
-Subject: [PATCH 1/8] libunwind: Add missing include of libunwind_ext.h to
+Subject: [PATCH 1/9] libunwind: Add missing include of libunwind_ext.h to
  CompactUnwinder.hpp, DwarfInstructions.hpp, and UnwindCursor.hpp
 
 http://www.llvm.org/bugs/show_bug.cgi?id=22202

Modified: trunk/dports/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch	2015-11-23 16:58:47 UTC (rev 142796)
+++ trunk/dports/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch	2015-11-23 17:11:50 UTC (rev 142797)
@@ -1,7 +1,7 @@
 From 22b584a1f23f02d79d041b3992f0a2d0ad4012c5 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sun, 11 Jan 2015 14:34:13 -0800
-Subject: [PATCH 2/8] libunwind: Use __builtin_trap rather than
+Subject: [PATCH 2/9] libunwind: Use __builtin_trap rather than
  __builtin_unreachable for older toolchains
 
 http://www.llvm.org/bugs/show_bug.cgi?id=22198

Modified: trunk/dports/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch	2015-11-23 16:58:47 UTC (rev 142796)
+++ trunk/dports/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch	2015-11-23 17:11:50 UTC (rev 142797)
@@ -1,7 +1,7 @@
 From 318ae788721a364c2da33562ceb18dc7038b8fc2 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sun, 11 Jan 2015 14:35:08 -0800
-Subject: [PATCH 3/8] libunwind: ppc build fix
+Subject: [PATCH 3/9] libunwind: ppc build fix
 
 http://www.llvm.org/bugs/show_bug.cgi?id=22200
 

Modified: trunk/dports/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch	2015-11-23 16:58:47 UTC (rev 142796)
+++ trunk/dports/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch	2015-11-23 17:11:50 UTC (rev 142797)
@@ -1,7 +1,7 @@
 From 47c5147e57318333ea446f2cb568a992b23f082f 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 4/8] libunwind: Only include <Availability.h> on Leopard and
+Subject: [PATCH 4/9] libunwind: Only include <Availability.h> on Leopard and
  newer OS X versions
 
 http://www.llvm.org/bugs/show_bug.cgi?id=22203

Modified: trunk/dports/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch	2015-11-23 16:58:47 UTC (rev 142796)
+++ trunk/dports/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch	2015-11-23 17:11:50 UTC (rev 142797)
@@ -1,7 +1,7 @@
 From b95b54d6cc96c0585d82a3787fbfbd8223400f73 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sun, 4 Jan 2015 13:21:39 -0800
-Subject: [PATCH 5/8] libunwind: MacPorts availability
+Subject: [PATCH 5/9] libunwind: MacPorts availability
 
 (cherry picked from commit 7400dc78d11961f50fd3f4af7fc13a7ac5555776)
 ---

Modified: trunk/dports/devel/libunwind/files/0006-MacPorts-Makefile.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0006-MacPorts-Makefile.patch	2015-11-23 16:58:47 UTC (rev 142796)
+++ trunk/dports/devel/libunwind/files/0006-MacPorts-Makefile.patch	2015-11-23 17:11:50 UTC (rev 142797)
@@ -1,7 +1,7 @@
-From b39cdf54c1df4358d2883336c6926a0dd48d543d Mon Sep 17 00:00:00 2001
+From 0ebb44471d513364d5bb9d9c1bb223329c45a8ab Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Tue, 20 Jan 2015 10:23:13 -0800
-Subject: [PATCH 6/8] MacPorts Makefile
+Subject: [PATCH 6/9] MacPorts Makefile
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 (cherry picked from commit 4501b3591276ceb3e88099ad653d727eb83f4789)
@@ -12,7 +12,7 @@
 
 diff --git a/src/Makefile b/src/Makefile
 new file mode 100644
-index 0000000..8fa9bf6
+index 0000000..5f62885
 --- /dev/null
 +++ b/src/Makefile
 @@ -0,0 +1,132 @@

Modified: trunk/dports/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch	2015-11-23 16:58:47 UTC (rev 142796)
+++ trunk/dports/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch	2015-11-23 17:11:50 UTC (rev 142797)
@@ -1,7 +1,7 @@
-From b5d128f0bd152254de0d357e938421ea51acdc13 Mon Sep 17 00:00:00 2001
+From eea9d5c90d114e32fa0e66f357dbe2f7f4077919 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sun, 4 Jan 2015 13:30:53 -0800
-Subject: [PATCH 7/8] libunwind: Fix fallback implementation of
+Subject: [PATCH 7/9] libunwind: Fix fallback implementation of
  _dyld_find_unwind_sections for x86_64 and document dependency on a newer
  libmacho
 

Modified: trunk/dports/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch	2015-11-23 16:58:47 UTC (rev 142796)
+++ trunk/dports/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch	2015-11-23 17:11:50 UTC (rev 142797)
@@ -1,7 +1,7 @@
-From fa6c5bb5bcf432c1839909365c7fc11dda172b15 Mon Sep 17 00:00:00 2001
+From f91d9bfa17478442902517e56199c796ae57efd6 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 7 Mar 2015 19:58:56 -0800
-Subject: [PATCH 8/8] Define __STDC_FORMAT_MACROS to bring in format macros
+Subject: [PATCH 8/9] Define __STDC_FORMAT_MACROS to bring in format macros
  when including <inttypes.h> in C++ code
 
 Fixes regression from: 1f22bd54e8565959c1d2c3ed7384cb77e18d0807

Added: trunk/dports/devel/libunwind/files/0009-libunwind-Remove-unused-includes.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0009-libunwind-Remove-unused-includes.patch	                        (rev 0)
+++ trunk/dports/devel/libunwind/files/0009-libunwind-Remove-unused-includes.patch	2015-11-23 17:11:50 UTC (rev 142797)
@@ -0,0 +1,55 @@
+From fc92ed7ffa081bfc140391060d0dc435d14d5af3 Mon Sep 17 00:00:00 2001
+From: Peter Zotov <whitequark at whitequark.org>
+Date: Thu, 27 Aug 2015 06:58:31 +0000
+Subject: [PATCH 9/9] [libunwind] Remove unused includes.
+
+git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@246143 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit a3e613de71af050c07199eaa53c3675708268dab)
+---
+ src/DwarfParser.hpp | 2 --
+ src/Registers.hpp   | 1 -
+ src/libunwind.cpp   | 3 ---
+ 3 files changed, 6 deletions(-)
+
+diff --git a/src/DwarfParser.hpp b/src/DwarfParser.hpp
+index 0c24dc6..a0e7288 100644
+--- a/src/DwarfParser.hpp
++++ b/src/DwarfParser.hpp
+@@ -19,8 +19,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#include <vector>
+-
+ #include "libunwind.h"
+ #include "dwarf2.h"
+ 
+diff --git a/src/Registers.hpp b/src/Registers.hpp
+index 4a441b7..36653ef 100644
+--- a/src/Registers.hpp
++++ b/src/Registers.hpp
+@@ -14,7 +14,6 @@
+ #define __REGISTERS_HPP__
+ 
+ #include <stdint.h>
+-#include <strings.h>
+ #include <string.h>
+ 
+ #include "libunwind.h"
+diff --git a/src/libunwind.cpp b/src/libunwind.cpp
+index 9a16e48..57e0732 100644
+--- a/src/libunwind.cpp
++++ b/src/libunwind.cpp
+@@ -16,9 +16,6 @@
+ #include <cstdlib> // getenv
+ #endif
+ #include <new>
+-#include <tuple>
+-#include <memory>
+-#include <vector>
+ #include <algorithm>
+ 
+ #include "libunwind_ext.h"
+-- 
+2.6.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/9f2aa2e3/attachment.html>

More information about the macports-changes mailing list