[149978] trunk/dports/devel/cctools
jeremyhu at macports.org
jeremyhu at macports.org
Thu Jul 7 00:58:59 PDT 2016
Revision: 149978
https://trac.macports.org/changeset/149978
Author: jeremyhu at macports.org
Date: 2016-07-07 00:58:59 -0700 (Thu, 07 Jul 2016)
Log Message:
-----------
cctools: Bump to version 886
Modified Paths:
--------------
trunk/dports/devel/cctools/Portfile
Removed Paths:
-------------
trunk/dports/devel/cctools/files/PR-24031030.patch
trunk/dports/devel/cctools/files/cctools-877-no-lto.patch
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- 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)
@@ -3,9 +3,9 @@
PortSystem 1.0
name cctools
-# Xcode 7.2
-version 877.8
-set ld64_version 253.9
+# Xcode 7.3.1
+version 886
+set ld64_version 264.3.102
categories devel
platforms darwin
maintainers jeremyhu openmaintainer
@@ -22,12 +22,12 @@
distfiles ld64-${ld64_version}.tar.gz ${name}-${version}.tar.gz
-checksums ld64-253.9.tar.gz \
- rmd160 99f42a9f2621d92f0140f0b94ad4bad4daff8bf2 \
- sha256 8fa3a1b65f665824ac129c02e2fab8926a06e503ec277ea32cd8bc27c8de11c3 \
- cctools-877.8.tar.gz \
- rmd160 cafae24d486e36cf7e674d6ca9051ddf2894febd \
- sha256 88be2788adf461f1d8278324b0078f6003b2328b6f95a54b16ec6ed1ba651dc2
+checksums ld64-264.3.102.tar.gz \
+ rmd160 c8169a8dd591989abdf45c0834397891ec72b458 \
+ sha256 307f73678a3e5c9ed4d1bcf77da7399d84efac32916c5df6cd477c3b5c36f953 \
+ cctools-886.tar.gz \
+ rmd160 ecd54d8b4ec062909044c003b7e5bd638729cf57 \
+ sha256 f3a4fa7dad4a54d862b1d9f48e3dfb25fc532c9cf46a041cf8134694328a8878
depends_build port:libunwind-headers
@@ -36,10 +36,8 @@
PR-37520.patch \
cctools-839-static-dis_info.patch \
PR-12400897.patch \
- PR-24031030.patch \
cctools-862-prunetrie.patch \
- not-clang.patch \
- cctools-877-no-lto.patch
+ not-clang.patch
variant universal {}
@@ -89,7 +87,7 @@
}
use_configure no
-destroot.args DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
+destroot.args RAW_DSTROOT=${destroot} DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
post-extract {
file copy ${worksrcpath}/../ld64-${ld64_version}/src/other/PruneTrie.cpp ${worksrcpath}/misc
Deleted: trunk/dports/devel/cctools/files/PR-24031030.patch
===================================================================
--- 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)
@@ -1,64 +0,0 @@
-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.
Deleted: trunk/dports/devel/cctools/files/cctools-877-no-lto.patch
===================================================================
--- 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)
@@ -1,40 +0,0 @@
---- 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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160707/942ba5d3/attachment.html>
More information about the macports-changes
mailing list