<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[130895] trunk/dports/devel</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/130895">130895</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-01-03 16:17:20 -0800 (Sat, 03 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libunwind: Make libunwind-headers a subport of libunwind</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibunwindPortfile">trunk/dports/devel/libunwind/Portfile</a></li>
<li><a href="#trunkdportsdevellibunwindfilesMakefile">trunk/dports/devel/libunwind/files/Makefile</a></li>
<li><a href="#trunkdportsdevellibunwindfileslibunwindavailablepatch">trunk/dports/devel/libunwind/files/libunwind-available.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/devel/libunwind-headers/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibunwindPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libunwind/Portfile (130894 => 130895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/Portfile 2015-01-04 00:16:36 UTC (rev 130894)
+++ trunk/dports/devel/libunwind/Portfile 2015-01-04 00:17:20 UTC (rev 130895)
</span><span class="lines">@@ -5,7 +5,9 @@
</span><span class="cx">
</span><span class="cx"> name libunwind
</span><span class="cx"> version 3.5.0
</span><del>-categories lang
</del><ins>+revision 1
+epoch 1
+categories devel
</ins><span class="cx"> platforms darwin
</span><span class="cx"> license MIT NCSA
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -42,23 +44,46 @@
</span><span class="cx"> patchfiles \
</span><span class="cx"> libunwind-available.patch
</span><span class="cx">
</span><ins>+post-patch {
+ if {${os.major} < 9} {
+ foreach reg {cr ctr eax ebp ebx ecx edi edx eip esi esp lr mq r0 r1 r10 r11 r12 r13 r14 r15 r16 r17 r18 r19 r2 r20 r21 r22 r23 r24 r25 r26 r27 r28 r29 r3 r30 r31 r4 r5 r6 r7 r8 r9 rax rbp rbx rcx rdi rdx rip rsi rsp srr0 srr1 vrsave xer} {
+ reinplace "s|__${reg}|${reg}|g" ${build.dir}/Registers.hpp
+ }
+ }
+}
+
</ins><span class="cx"> set cxx_stdlibflags {}
</span><span class="cx"> if {[string match *clang* ${configure.cxx}]} {
</span><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-build.dir ${worksrcpath}/src/Unwind
-build.args \
- PREFIX="${prefix}/lib/${name}" \
- CC="${configure.cc}" \
- CXX="${configure.cxx}" \
- CPPFLAGS="${configure.cppflags} -DNDEBUG" \
- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
- CXXFLAGS="${configure.cxxflags} ${cxx_stdlibflags} [get_canonical_archflags cxx]" \
- LDFLAGS="${configure.ldflags} ${cxx_stdlibflags} [get_canonical_archflags ld]"
</del><ins>+build.dir ${worksrcpath}/src/Unwind
+destroot.dir ${build.dir}
</ins><span class="cx">
</span><del>-destroot.dir ${build.dir}
-destroot.args \
- PREFIX="${prefix}/lib/${name}"
</del><ins>+subport libunwind-headers {
+ build {}
</ins><span class="cx">
</span><ins>+ destroot.target installhdrs
+ destroot.args \
+ PREFIX="${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr"
+}
+
+if {${subport} == "${name}"} {
+ # Technically not needed, but subports will expect depending on libunwind to pull in the headers
+ depends_lib-append port:libunwind-headers
+
+ build.args \
+ PREFIX="${prefix}" \
+ CC="${configure.cc}" \
+ CXX="${configure.cxx}" \
+ CPPFLAGS="${configure.cppflags} -DNDEBUG" \
+ CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+ CXXFLAGS="${configure.cxxflags} ${cxx_stdlibflags} [get_canonical_archflags cxx]" \
+ LDFLAGS="${configure.ldflags} ${cxx_stdlibflags} [get_canonical_archflags ld]"
+
+ destroot.target installlibs
+ destroot.args \
+ PREFIX="${prefix}"
+}
+
</ins><span class="cx"> livecheck.type none
</span></span></pre></div>
<a id="trunkdportsdevellibunwindfilesMakefile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libunwind/files/Makefile (130894 => 130895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/Makefile 2015-01-04 00:16:36 UTC (rev 130894)
+++ trunk/dports/devel/libunwind/files/Makefile 2015-01-04 00:17:20 UTC (rev 130895)
</span><span class="lines">@@ -12,10 +12,13 @@
</span><span class="cx"> MACHO_INCDIR = $(INCDIR)/mach-o
</span><span class="cx"> LIBUNWIND_FILENAME = libunwind.1.dylib
</span><span class="cx"> LIBUNWIND_SYMLINKNAME = libunwind.dylib
</span><ins>+LIBUNWIND_FILENAME_STATIC = libunwind.a
</ins><span class="cx"> LIBUNWIND_COMPAT_VERSION = 1.0.0
</span><span class="cx"> LIBUNWIND_CURRENT_VERSION = 1.0.0
</span><span class="cx">
</span><span class="cx"> # Default toolchain
</span><ins>+AR = $(shell xcrun -find ar)
+RANLIB = $(shell xcrun -find ranlib)
</ins><span class="cx"> CC = $(shell xcrun -find cc)
</span><span class="cx"> CXX = $(shell xcrun -find c++)
</span><span class="cx"> STRIP = $(shell xcrun -find strip)
</span><span class="lines">@@ -83,8 +86,12 @@
</span><span class="cx"> -compatibility_version $(LIBUNWIND_COMPAT_VERSION) -current_version $(LIBUNWIND_CURRENT_VERSION) \
</span><span class="cx"> $(OBJS)
</span><span class="cx">
</span><del>-all: $(OBJROOT)/$(LIBUNWIND_FILENAME)
</del><ins>+$(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC): $(OBJS)
+ $(AR) cru $@ $(OBJS)
+ $(RANLIB) $@
</ins><span class="cx">
</span><ins>+all: $(OBJROOT)/$(LIBUNWIND_FILENAME) $(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC)
+
</ins><span class="cx"> installhdrs:
</span><span class="cx"> install -d -m 755 $(DSTROOT)$(INCDIR)
</span><span class="cx"> install -d -m 755 $(DSTROOT)$(LIBUNWIND_INCDIR)
</span><span class="lines">@@ -102,7 +109,7 @@
</span><span class="cx"> install -m 644 $$f $(DSTROOT)$(MACHO_INCDIR); \
</span><span class="cx"> done
</span><span class="cx">
</span><del>-install: installhdrs $(OBJROOT)/$(LIBUNWIND_FILENAME)
</del><ins>+installdylib: $(OBJROOT)/$(LIBUNWIND_FILENAME)
</ins><span class="cx"> ifdef SYMROOT
</span><span class="cx"> install -m 755 $(OBJROOT)/$(LIBUNWIND_FILENAME) $(SYMROOT)
</span><span class="cx"> $(DSYMUTIL) --out $(SYMROOT)/$(LIBUNWIND_FILENAME).dSYM $(OBJROOT)/$(LIBUNWIND_FILENAME)
</span><span class="lines">@@ -112,4 +119,11 @@
</span><span class="cx"> ifneq "NO" "$(STRIP_ON_INSTALL)"
</span><span class="cx"> $(STRIP) $(STRIP_LIB_FLAGS) $(DSTROOT)$(LIBDIR)/$(LIBUNWIND_FILENAME)
</span><span class="cx"> endif
</span><ins>+ ln -s $(LIBUNWIND_FILENAME) $(DSTROOT)$(LIBDIR)/$(LIBUNWIND_SYMLINKNAME)
</ins><span class="cx">
</span><ins>+installstatic: $(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC)
+ install -d -m 755 $(DSTROOT)$(LIBDIR)
+ install -m 644 $(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC) $(DSTROOT)$(LIBDIR)
+
+installlibs: installdylib installstatic
+install: installhdrs installlibs
</ins></span></pre></div>
<a id="trunkdportsdevellibunwindfileslibunwindavailablepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libunwind/files/libunwind-available.patch (130894 => 130895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/libunwind-available.patch 2015-01-04 00:16:36 UTC (rev 130894)
+++ trunk/dports/devel/libunwind/files/libunwind-available.patch 2015-01-04 00:17:20 UTC (rev 130895)
</span><span class="lines">@@ -1,20 +1,13 @@
</span><del>---- include/libunwind.h.orig 2014-06-25 16:39:00.000000000 -0700
-+++ include/libunwind.h 2015-01-03 00:11:33.000000000 -0800
-@@ -25,16 +25,7 @@
</del><ins>+diff --git a/include/libunwind.h b/include/libunwind.h
+index 448d86a..971953b 100644
+--- include/libunwind.h
++++ include/libunwind.h
+@@ -25,7 +25,7 @@
</ins><span class="cx"> #define LIBCXXABI_ARM_EHABI 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> -#if __APPLE__
</span><del>-- #include <Availability.h>
-- #if __arm__
-- #define LIBUNWIND_AVAIL __attribute__((unavailable))
-- #else
-- #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
-- #endif
--#else
-- #define LIBUNWIND_AVAIL
--#endif
-+#define LIBUNWIND_AVAIL
-
- /* error codes */
- enum {
</del><ins>++#if defined(__APPLE__) && !defined(USE_MACPORTS_LIBUNWIND)
+ #include <Availability.h>
+ #if __arm__
+ #define LIBUNWIND_AVAIL __attribute__((unavailable))
</ins></span></pre>
</div>
</div>
</body>
</html>