<!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>[131399] trunk/dports/devel/cctools</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/131399">131399</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-01-10 21:34:59 -0800 (Sat, 10 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cctools: Drop dependency on ld64</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcctoolsPortfile">trunk/dports/devel/cctools/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcctoolsfilescctools806prunetriepatch">trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch</a></li>
<li><a href="#trunkdportsdevelcctoolsfilescctools862prunetriepatch">trunk/dports/devel/cctools/files/cctools-862-prunetrie.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcctoolsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cctools/Portfile (131398 => 131399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cctools/Portfile 2015-01-11 04:47:41 UTC (rev 131398)
+++ trunk/dports/devel/cctools/Portfile 2015-01-11 05:34:59 UTC (rev 131399)
</span><span class="lines">@@ -5,6 +5,8 @@
</span><span class="cx"> name cctools
</span><span class="cx"> # OS X 10.10.0
</span><span class="cx"> version 862
</span><ins>+set ld64_version 236.3
+revision 1
</ins><span class="cx"> categories devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -16,28 +18,39 @@
</span><span class="cx"> similar to binutils on other platforms.
</span><span class="cx">
</span><span class="cx"> homepage http://opensource.apple.com/source/${name}/
</span><del>-master_sites http://opensource.apple.com/tarballs/${name}/
</del><ins>+master_sites http://opensource.apple.com/tarballs/${name} \
+ http://opensource.apple.com/tarballs/ld64
</ins><span class="cx">
</span><del>-checksums rmd160 21ca74a5f9d04c37c2310f107e21a0f3713360dd \
</del><ins>+distfiles ld64-${ld64_version}.tar.gz ${name}-${version}.tar.gz
+
+checksums ld64-236.3.tar.gz \
+ rmd160 6a3f44aa9ae57a60d2cff5b3d47be7972ad83029 \
+ sha256 8ef36729b643201081ab45ebd8586ede8f9968bc17614b679a940faa82875ca6 \
+ cctools-862.tar.gz \
+ rmd160 21ca74a5f9d04c37c2310f107e21a0f3713360dd \
</ins><span class="cx"> sha256 1bf29f620b91c901ad3116b47738ab5076c1aed75d13869cd3bc7f067b4aaadb
</span><span class="cx">
</span><del>-depends_build port:ld64
</del><ins>+depends_build port:libunwind-headers
</ins><span class="cx">
</span><del>-patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch
</del><ins>+patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch cctools-862-prunetrie.patch
</ins><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="cx"> if {${os.arch} eq "powerpc" || ${os.major} < 9} {
</span><span class="cx"> # XCode 4.1
</span><span class="cx"> version 806
</span><del>- revision 3
- distname cctools-${version}
- checksums rmd160 91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
</del><ins>+ revision 4
+ distfiles ld64-${ld64_version}.tar.gz ${name}-${version}.tar.gz
+ checksums ld64-236.3.tar.gz \
+ rmd160 6a3f44aa9ae57a60d2cff5b3d47be7972ad83029 \
+ sha256 8ef36729b643201081ab45ebd8586ede8f9968bc17614b679a940faa82875ca6 \
+ cctools-806.tar.gz \
+ rmd160 91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
</ins><span class="cx"> sha256 6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
</span><span class="cx"> supported_archs ppc i386 x86_64
</span><span class="cx">
</span><del>- patchfiles-delete cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch
- patchfiles-append cctools-806-lto.patch PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch PR-11136237.patch PR-12475288.patch
</del><ins>+ patchfiles-delete cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch cctools-862-prunetrie.patch
+ patchfiles-append cctools-806-lto.patch PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch PR-11136237.patch PR-12475288.patch cctools-806-prunetrie.patch
</ins><span class="cx"> } else {
</span><span class="cx"> if {${os.major} < 11} {
</span><span class="cx"> patchfiles-append snowleopard-strnlen.patch
</span><span class="lines">@@ -77,6 +90,11 @@
</span><span class="cx"> use_configure no
</span><span class="cx"> destroot.args DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
</span><span class="cx">
</span><ins>+post-extract {
+ file copy ${worksrcpath}/../ld64-${ld64_version}/src/other/PruneTrie.cpp ${worksrcpath}/misc
+ system "touch ${worksrcpath}/../ld64-${ld64_version}/src/abstraction/configure.h"
+}
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> # We don't want to build cctools ld. We want to use ld64
</span><span class="cx"> reinplace "/^SUBDIRS_32/s/ld//" ${worksrcpath}/Makefile
</span><span class="lines">@@ -124,10 +142,11 @@
</span><span class="cx"> USE_DEPENDENCY_FILE=NO \
</span><span class="cx"> BUILD_DYLIBS=NO \
</span><span class="cx"> CC="${configure.cc} ${configure.cflags}" \
</span><del>- CXX="${configure.cxx} ${configure.cxxflags}" \
</del><ins>+ CXX="${configure.cxx} ${configure.cxxflags} -I${worksrcpath}/../ld64-${ld64_version}/src/abstraction -I${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include" \
</ins><span class="cx"> CXXLIB="${cxx_stdlibflags}" \
</span><ins>+ TRIE=-DTRIE_SUPPORT \
</ins><span class="cx"> RC_ARCHS="[get_canonical_archs]" \
</span><del>- SDK="-I${prefix}/include"
</del><ins>+ SDK="-I${prefix}/include -I${worksrcpath}/../ld64-${ld64_version}/src/other"
</ins><span class="cx">
</span><span class="cx"> if {${llvm_version} != ""} {
</span><span class="cx"> build.args-append \
</span><span class="lines">@@ -139,14 +158,6 @@
</span><span class="cx"> LTO= \
</span><span class="cx"> RC_CFLAGS="[get_canonical_archflags]"
</span><span class="cx"> }
</span><del>-
- if {[file exists ${prefix}/lib/libprunetrie.a]} {
- build.args-append \
- TRIE=-DTRIE_SUPPORT
- } else {
- build.args-append \
- TRIE=
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-destroot {
</span><span class="lines">@@ -155,10 +166,11 @@
</span><span class="cx"> USE_DEPENDENCY_FILE=NO \
</span><span class="cx"> BUILD_DYLIBS=NO \
</span><span class="cx"> CC="${configure.cc} ${configure.cflags}" \
</span><del>- CXX="${configure.cxx} ${configure.cxxflags}" \
</del><ins>+ CXX="${configure.cxx} ${configure.cxxflags} -I${worksrcpath}/../ld64-${ld64_version}/src/abstraction -I${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include" \
</ins><span class="cx"> CXXLIB="${cxx_stdlibflags}" \
</span><ins>+ TRIE=-DTRIE_SUPPORT \
</ins><span class="cx"> RC_ARCHS="[get_canonical_archs]" \
</span><del>- SDK="-I${prefix}/include"
</del><ins>+ SDK="-I${prefix}/include -I${worksrcpath}/../ld64-${ld64_version}/src/other"
</ins><span class="cx">
</span><span class="cx"> if {${llvm_version} != ""} {
</span><span class="cx"> destroot.args-append \
</span><span class="lines">@@ -170,14 +182,6 @@
</span><span class="cx"> LTO= \
</span><span class="cx"> RC_CFLAGS="[get_canonical_archflags]"
</span><span class="cx"> }
</span><del>-
- if {[file exists ${prefix}/lib/libprunetrie.a]} {
- destroot.args-append \
- TRIE=-DTRIE_SUPPORT
- } else {
- destroot.args-append \
- TRIE=
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> platform macosx {
</span></span></pre></div>
<a id="trunkdportsdevelcctoolsfilescctools806prunetriepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch (0 => 131399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch (rev 0)
+++ trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch 2015-01-11 05:34:59 UTC (rev 131399)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+--- misc/Makefile.orig 2015-01-10 20:43:30.000000000 -0800
++++ misc/Makefile 2015-01-10 20:51:27.000000000 -0800
+@@ -214,12 +214,16 @@ indr.NEW: indr.o vers.o
+ $(CC) $(RC_CFLAGS) $(SDK) -o $(SYMROOT)/indr.NEW \
+ $(OFILE_DIR)/indr.private.o
+
+-strip.NEW: strip.o vers.o
++strip.NEW: strip.o vers.o PruneTrie.o
+ $(CC) $(RC_CFLAGS) -nostdlib -r \
+ -o $(OBJROOT)/strip.private.o \
+ $(OFILE_DIR)/strip.o $(OFILE_DIR)/vers.o $(LIBSTUFF)
+ $(CXX) $(RC_CFLAGS) $(SDK) -o $(SYMROOT)/strip.NEW \
+- $(OFILE_DIR)/strip.private.o $(LIB_PRUNETRIE)
++ $(OFILE_DIR)/strip.private.o $(OFILE_DIR)/PruneTrie.o
++
++PruneTrie.o: PruneTrie.cpp
++ $(CXX) $(CXXFLAGS) $(RC_CFLAGS) $(SDK) $(CXXLIB) -c -o \
++ $(OBJROOT)/PruneTrie.o $(SRCROOT)/PruneTrie.cpp
+
+ nmedit.NEW: nmedit.o vers.o
+ $(CC) $(RC_CFLAGS) -nostdlib -r \
+--- misc/strip.c.orig 2015-01-10 21:25:17.000000000 -0800
++++ misc/strip.c 2015-01-10 21:25:40.000000000 -0800
+@@ -47,7 +47,7 @@
+ #include "stuff/unix_standard_mode.h"
+ #include "stuff/execute.h"
+ #ifdef TRIE_SUPPORT
+-#include <mach-o/prune_trie.h>
++#include "prune_trie.h"
+ #endif /* TRIE_SUPPORT */
+
+ /* These are set from the command line arguments */
</ins></span></pre></div>
<a id="trunkdportsdevelcctoolsfilescctools862prunetriepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/cctools/files/cctools-862-prunetrie.patch (0 => 131399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cctools/files/cctools-862-prunetrie.patch (rev 0)
+++ trunk/dports/devel/cctools/files/cctools-862-prunetrie.patch 2015-01-11 05:34:59 UTC (rev 131399)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+--- misc/Makefile.orig 2015-01-10 20:43:30.000000000 -0800
++++ misc/Makefile 2015-01-10 20:51:27.000000000 -0800
+@@ -201,14 +201,18 @@ indr.NEW: indr.o
+ $(OFILE_DIR)/indr.private.o
+ $(DSYMUTIL) $(SYMROOT)/indr.NEW
+
+-strip.NEW: strip.o
++strip.NEW: strip.o PruneTrie.o
+ $(CC) $(RC_CFLAGS) -nostdlib -r \
+ -o $(OBJROOT)/strip.private.o \
+ $(OFILE_DIR)/strip.o $(LIBSTUFF)
+ $(CXX) $(RC_CFLAGS) $(SDK) -o $(SYMROOT)/strip.NEW \
+- $(OFILE_DIR)/strip.private.o $(LIB_PRUNETRIE) $(CXXLIB)
++ $(OFILE_DIR)/strip.private.o $(OFILE_DIR)/PruneTrie.o $(CXXLIB)
+ $(DSYMUTIL) $(SYMROOT)/strip.NEW
+
++PruneTrie.o: PruneTrie.cpp
++ $(CXX) $(CXXFLAGS) $(RC_CFLAGS) $(SDK) $(CXXLIB) -c -o \
++ $(OBJROOT)/PruneTrie.o $(SRCROOT)/PruneTrie.cpp
++
+ nmedit.NEW: nmedit.o
+ $(CC) $(RC_CFLAGS) -nostdlib -r \
+ -o $(OBJROOT)/nmedit.private.o \
+--- misc/strip.c.orig 2015-01-10 21:25:17.000000000 -0800
++++ misc/strip.c 2015-01-10 21:25:40.000000000 -0800
+@@ -47,7 +47,7 @@
+ #include "stuff/unix_standard_mode.h"
+ #include "stuff/execute.h"
+ #ifdef TRIE_SUPPORT
+-#include <mach-o/prune_trie.h>
++#include "prune_trie.h"
+ #endif /* TRIE_SUPPORT */
+
+ /* These are set from the command line arguments */
</ins></span></pre>
</div>
</div>
</body>
</html>