<!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>[149978] 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/149978">149978</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-07-07 00:58:59 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>cctools: Bump to version 886</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcctoolsPortfile">trunk/dports/devel/cctools/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcctoolsfilesPR24031030patch">trunk/dports/devel/cctools/files/PR-24031030.patch</a></li>
<li><a href="#trunkdportsdevelcctoolsfilescctools877noltopatch">trunk/dports/devel/cctools/files/cctools-877-no-lto.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 (149977 => 149978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cctools/Portfile 2016-07-07 07:33:40 UTC (rev 149977)
+++ trunk/dports/devel/cctools/Portfile 2016-07-07 07:58:59 UTC (rev 149978)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name cctools
</span><del>-# Xcode 7.2
-version 877.8
-set ld64_version 253.9
</del><ins>+# Xcode 7.3.1
+version 886
+set ld64_version 264.3.102
</ins><span class="cx"> categories devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -22,12 +22,12 @@
</span><span class="cx">
</span><span class="cx"> distfiles ld64-${ld64_version}.tar.gz ${name}-${version}.tar.gz
</span><span class="cx">
</span><del>-checksums ld64-253.9.tar.gz \
- rmd160 99f42a9f2621d92f0140f0b94ad4bad4daff8bf2 \
- sha256 8fa3a1b65f665824ac129c02e2fab8926a06e503ec277ea32cd8bc27c8de11c3 \
- cctools-877.8.tar.gz \
- rmd160 cafae24d486e36cf7e674d6ca9051ddf2894febd \
- sha256 88be2788adf461f1d8278324b0078f6003b2328b6f95a54b16ec6ed1ba651dc2
</del><ins>+checksums ld64-264.3.102.tar.gz \
+ rmd160 c8169a8dd591989abdf45c0834397891ec72b458 \
+ sha256 307f73678a3e5c9ed4d1bcf77da7399d84efac32916c5df6cd477c3b5c36f953 \
+ cctools-886.tar.gz \
+ rmd160 ecd54d8b4ec062909044c003b7e5bd638729cf57 \
+ sha256 f3a4fa7dad4a54d862b1d9f48e3dfb25fc532c9cf46a041cf8134694328a8878
</ins><span class="cx">
</span><span class="cx"> depends_build port:libunwind-headers
</span><span class="cx">
</span><span class="lines">@@ -36,10 +36,8 @@
</span><span class="cx"> PR-37520.patch \
</span><span class="cx"> cctools-839-static-dis_info.patch \
</span><span class="cx"> PR-12400897.patch \
</span><del>- PR-24031030.patch \
</del><span class="cx"> cctools-862-prunetrie.patch \
</span><del>- not-clang.patch \
- cctools-877-no-lto.patch
</del><ins>+ not-clang.patch
</ins><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="lines">@@ -89,7 +87,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><del>-destroot.args DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
</del><ins>+destroot.args RAW_DSTROOT=${destroot} DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
</ins><span class="cx">
</span><span class="cx"> post-extract {
</span><span class="cx"> file copy ${worksrcpath}/../ld64-${ld64_version}/src/other/PruneTrie.cpp ${worksrcpath}/misc
</span></span></pre></div>
<a id="trunkdportsdevelcctoolsfilesPR24031030patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/cctools/files/PR-24031030.patch (149977 => 149978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cctools/files/PR-24031030.patch 2016-07-07 07:33:40 UTC (rev 149977)
+++ trunk/dports/devel/cctools/files/PR-24031030.patch 2016-07-07 07:58:59 UTC (rev 149978)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-diff --git a/include/stuff/ofile.h b/include/stuff/ofile.h
-index e6721f8..04e4ead 100644
---- include/stuff/ofile.h
-+++ include/stuff/ofile.h
-@@ -92,7 +92,7 @@ struct ofile {
-
- /* If this structure is currently referencing an archive member or an object
- file that is an archive member these are valid and filled in. */
-- uint32_t member_offset; /* logical offset to the member starting */
-+ uint64_t member_offset; /* logical offset to the member starting */
- char *member_addr; /* pointer to the member contents */
- uint32_t member_size; /* actual size of the member (not rounded)*/
- struct ar_hdr *member_ar_hdr; /* pointer to the ar_hdr for this member */
-diff --git a/misc/libtool.c b/misc/libtool.c
-index 57a0a43..f430350 100644
---- misc/libtool.c
-+++ misc/libtool.c
-@@ -194,7 +194,7 @@ struct arch {
- };
-
- struct member {
-- uint32_t offset; /* current working offset and final offset*/
-+ uint64_t offset; /* current working offset and final offset*/
- struct ar_hdr ar_hdr; /* the archive header for this member */
- char null_byte; /* space to write '\0' for ar_hdr */
- char *object_addr; /* the address of the object file */
-@@ -225,7 +225,7 @@ struct member {
- char *input_base_name; /* the base name in the input file */
- uint32_t input_base_name_size; /* the size of the base name */
- struct ar_hdr *input_ar_hdr;
-- uint32_t input_member_offset; /* if from a thin archive */
-+ uint64_t input_member_offset; /* if from a thin archive */
- };
-
- static void usage(
-@@ -2272,8 +2272,8 @@ create_library(
- char *output,
- struct ofile *ofile)
- {
-- uint32_t i, j, k, pad, *time_offsets;
-- uint64_t library_size, offset;
-+ uint32_t i, j, k, pad;
-+ uint64_t library_size, offset, *time_offsets;
- enum byte_sex target_byte_sex;
- char *library, *p, *flush_start;
- kern_return_t r;
-@@ -2432,7 +2432,7 @@ struct ofile *ofile)
- * contents archive header's ar_date fields. In this case we just
- * have one since this is a thin file (non-fat) file.
- */
-- time_offsets = allocate(1 * sizeof(uint32_t));
-+ time_offsets = allocate(1 * sizeof(uint64_t));
- /*
- * Calculate the offset to the archive header's time field for the
- * table of contents.
-@@ -2597,7 +2597,7 @@ fail_to_update_toc_in_place:
- * The time_offsets array records the offsets to the table of conternts
- * archive header's ar_date fields.
- */
-- time_offsets = allocate(narchs * sizeof(uint32_t));
-+ time_offsets = allocate(narchs * sizeof(uint64_t));
-
- /*
- * Now put each arch in the buffer.
</del></span></pre></div>
<a id="trunkdportsdevelcctoolsfilescctools877noltopatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/cctools/files/cctools-877-no-lto.patch (149977 => 149978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cctools/files/cctools-877-no-lto.patch 2016-07-07 07:33:40 UTC (rev 149977)
+++ trunk/dports/devel/cctools/files/cctools-877-no-lto.patch 2016-07-07 07:58:59 UTC (rev 149978)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>---- misc/libtool.c~ 2015-02-20 03:03:01.000000000 +0100
-+++ misc/libtool.c 2015-11-27 22:20:12.000000000 +0100
-@@ -263,9 +263,11 @@
- static void make_table_of_contents(
- struct arch *arch,
- char *output);
-+#ifdef LTO_SUPPORT
- static void save_lto_member_toc_info(
- struct member *member,
- void *mod);
-+#endif /* LTO_SUPPORT */
- static int toc_name_qsort(
- const struct toc *toc1,
- const struct toc *toc2);
-@@ -1436,7 +1438,9 @@
- do{
- if(ofiles[i].mh != NULL ||
- ofiles[i].mh64 != NULL ||
-+#ifdef LTO_SUPPORT
- ofiles[i].lto != NULL ||
-+#endif /* LTO_SUPPORT */
- cmd_flags.ranlib == TRUE){
- add_member(ofiles + i);
- }
-@@ -3829,6 +3833,7 @@
- (int)sizeof(arch->toc_ar_hdr.ar_fmag));
- }
-
-+#ifdef LTO_SUPPORT
- /*
- * save_lto_member_toc_info() saves away the table of contents info for a
- * member that has lto_content. This allows the lto module to be disposed of
-@@ -3861,6 +3866,7 @@
- }
- }
- }
-+#endif /* LTO_SUPPORT */
-
- /*
- * Function for qsort() for comparing toc structures by name.
</del></span></pre>
</div>
</div>
</body>
</html>