[132915] trunk/dports/devel/cctools
jeremyhu at macports.org
jeremyhu at macports.org
Fri Feb 13 00:51:03 PST 2015
Revision: 132915
https://trac.macports.org/changeset/132915
Author: jeremyhu at macports.org
Date: 2015-02-13 00:51:03 -0800 (Fri, 13 Feb 2015)
Log Message:
-----------
cctools: Remove hack for Tiger since current cctools now builds on Tiger (see #46629)
Modified Paths:
--------------
trunk/dports/devel/cctools/Portfile
Removed Paths:
-------------
trunk/dports/devel/cctools/files/PR-11136237.patch
trunk/dports/devel/cctools/files/PR-12475288.patch
trunk/dports/devel/cctools/files/PR-9087924.patch
trunk/dports/devel/cctools/files/PR-9830754.patch
trunk/dports/devel/cctools/files/cctools-806-lto.patch
trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch
trunk/dports/devel/cctools/files/cctools-822-no-lto.patch
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2015-02-13 01:49:28 UTC (rev 132914)
+++ trunk/dports/devel/cctools/Portfile 2015-02-13 08:51:03 UTC (rev 132915)
@@ -36,24 +36,8 @@
variant universal {}
-if {${os.major} < 9} {
- # XCode 4.1
- version 806
- 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 \
- sha256 6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
-
- patchfiles-delete cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch cctools-862-prunetrie.patch cctools-862-unifdef__DARWIN_UNIX03-arm.patch cctools-862-no-lto.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
-} else {
- if {${os.major} < 11} {
- patchfiles-append snowleopard-strnlen.patch
- }
+if {${os.major} < 11} {
+ patchfiles-append snowleopard-strnlen.patch
}
if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36] && ![variant_isset llvm37]} {
Deleted: trunk/dports/devel/cctools/files/PR-11136237.patch
===================================================================
--- trunk/dports/devel/cctools/files/PR-11136237.patch 2015-02-13 01:49:28 UTC (rev 132914)
+++ trunk/dports/devel/cctools/files/PR-11136237.patch 2015-02-13 08:51:03 UTC (rev 132915)
@@ -1,122 +0,0 @@
-379 % cvs diff -p as/{notes,as.h,dwarf2dbg.h,arm.c} otool/{notes,print_objc2_32bit.c,print_objc2_64bit.c}
-Index: as/as.h
-===================================================================
-RCS file: /cvs/root/cctools/as/as.h,v
-retrieving revision 1.10
-diff -p -r1.10 as.h
-*** as/as.h 2 Jul 2010 01:14:33 -0000 1.10
---- as/as.h 28 Mar 2012 23:38:13 -0000
-*************** extern cpu_subtype_t archflag_cpusubtype
-*** 179,185 ****
- extern char *specific_archflag;
-
- /* TRUE if the .subsections_via_symbols directive was seen */
-! int subsections_via_symbols;
-
- /* -I path options for .includes */
- struct directory_stack {
---- 179,185 ----
- extern char *specific_archflag;
-
- /* TRUE if the .subsections_via_symbols directive was seen */
-! extern int subsections_via_symbols;
-
- /* -I path options for .includes */
- struct directory_stack {
-Index: as/dwarf2dbg.h
-===================================================================
-RCS file: /cvs/root/cctools/as/dwarf2dbg.h,v
-retrieving revision 1.3
-diff -p -r1.3 dwarf2dbg.h
-*** as/dwarf2dbg.h 2 Jul 2010 01:14:33 -0000 1.3
---- as/dwarf2dbg.h 28 Mar 2012 23:38:13 -0000
-*************** extern void dwarf2_emit_label (symbolS *
-*** 115,121 ****
- /* True when we're supposed to set the basic block mark whenever a label
- is seen. Unless the target is doing Something Weird, just call
- dwarf2_emit_label. */
-! bfd_boolean dwarf2_loc_mark_labels;
-
- extern void dwarf2_finish (void);
-
---- 115,121 ----
- /* True when we're supposed to set the basic block mark whenever a label
- is seen. Unless the target is doing Something Weird, just call
- dwarf2_emit_label. */
-! extern bfd_boolean dwarf2_loc_mark_labels;
-
- extern void dwarf2_finish (void);
-
-Index: as/arm.c
-===================================================================
-RCS file: /cvs/root/cctools/as/arm.c,v
-retrieving revision 1.83
-diff -p -r1.83 arm.c
-*** as/arm.c 15 Mar 2012 21:29:46 -0000 1.83
---- as/arm.c 28 Mar 2012 23:38:13 -0000
-*************** typedef enum {
-*** 151,158 ****
- # define N_(String) (String)
-
- /* STUFF FROM gas/as.h */
-! #define COMMON
-! COMMON subsegT now_subseg;
-
- /* STUFF FROM gas/config/tc-arm.h */
- #define ARM_FLAG_THUMB (1 << 0) /* The symbol is a Thumb symbol rather than an Arm symbol. */
---- 151,157 ----
- # define N_(String) (String)
-
- /* STUFF FROM gas/as.h */
-! extern subsegT now_subseg;
-
- /* STUFF FROM gas/config/tc-arm.h */
- #define ARM_FLAG_THUMB (1 << 0) /* The symbol is a Thumb symbol rather than an Arm symbol. */
-Index: otool/print_objc2_32bit.c
-===================================================================
-RCS file: /cvs/root/cctools/otool/print_objc2_32bit.c,v
-retrieving revision 1.7
-diff -p -r1.7 print_objc2_32bit.c
-*** otool/print_objc2_32bit.c 31 Jul 2009 00:57:06 -0000 1.7
---- otool/print_objc2_32bit.c 28 Mar 2012 23:38:13 -0000
-*************** struct category_t {
-*** 259,265 ****
- uint32_t protocols; /* struct protocol_list_t * (32-bit pointer) */
- uint32_t instanceProperties; /* struct objc_property_list *
- (32-bit pointer) */
-! } category_t;
-
- static
- void
---- 259,265 ----
- uint32_t protocols; /* struct protocol_list_t * (32-bit pointer) */
- uint32_t instanceProperties; /* struct objc_property_list *
- (32-bit pointer) */
-! };
-
- static
- void
-Index: otool/print_objc2_64bit.c
-===================================================================
-RCS file: /cvs/root/cctools/otool/print_objc2_64bit.c,v
-retrieving revision 1.9
-diff -p -r1.9 print_objc2_64bit.c
-*** otool/print_objc2_64bit.c 31 Jul 2009 00:57:06 -0000 1.9
---- otool/print_objc2_64bit.c 28 Mar 2012 23:38:13 -0000
-*************** struct category_t {
-*** 262,268 ****
- uint64_t protocols; /* struct protocol_list_t * (64-bit pointer) */
- uint64_t instanceProperties; /* struct objc_property_list *
- (64-bit pointer) */
-! } category_t;
-
- static
- void
---- 262,268 ----
- uint64_t protocols; /* struct protocol_list_t * (64-bit pointer) */
- uint64_t instanceProperties; /* struct objc_property_list *
- (64-bit pointer) */
-! };
-
- static
- void
Deleted: trunk/dports/devel/cctools/files/PR-12475288.patch
===================================================================
--- trunk/dports/devel/cctools/files/PR-12475288.patch 2015-02-13 01:49:28 UTC (rev 132914)
+++ trunk/dports/devel/cctools/files/PR-12475288.patch 2015-02-13 08:51:03 UTC (rev 132915)
@@ -1,18 +0,0 @@
---- as/driver.c.orig 2012-10-10 17:17:27.000000000 -0700
-+++ as/driver.c 2012-10-10 17:21:11.000000000 -0700
-@@ -107,8 +107,15 @@ char **envp)
- case 'I': /* -I directory */
- case 'm': /* -mc68000, -mc68010 and mc68020 */
- case 'N': /* -NEXTSTEP-deployment-target */
-+ /* We want to skip the next argv if the value is not contained in this argv
-+ * eg: -I dir
-+ */
- if(p[1] == '\0')
- i++;
-+
-+ /* And in case the value is contained in this argv (eg: -Idir), skip the rest */
-+ while(p[1])
-+ p++;
- break;
-
- case 'a':
Deleted: trunk/dports/devel/cctools/files/PR-9087924.patch
===================================================================
--- trunk/dports/devel/cctools/files/PR-9087924.patch 2015-02-13 01:49:28 UTC (rev 132914)
+++ trunk/dports/devel/cctools/files/PR-9087924.patch 2015-02-13 08:51:03 UTC (rev 132915)
@@ -1,298 +0,0 @@
-diff -Naurp include/stuff/lto.h include/stuff/lto.h
---- include/stuff/lto.h 2009-03-13 13:44:10.000000000 -0700
-+++ include/stuff/lto.h 1969-12-31 16:00:00.000000000 -0800
-@@ -1,14 +1,15 @@
- #ifndef _STUFF_LTO_H_
- #define _STUFF_LTO_H_
-
--#ifdef LTO_SUPPORT
-+#include "stuff/arch.h"
-
--#include "stuff/ofile.h"
-+#ifdef LTO_SUPPORT
-
--__private_extern__ int is_llvm_bitcode(
-- struct ofile *ofile,
-+__private_extern__ int is_llvm_bitcode_from_memory(
- char *addr,
-- size_t size);
-+ uint32_t size,
-+ struct arch_flag *arch_flag,
-+ void **mod); /* maybe NULL */
-
- __private_extern__ uint32_t lto_get_nsyms(
- void *mod);
-diff -Naurp include/stuff/ofile.h include/stuff/ofile.h
---- include/stuff/ofile.h 1969-12-31 16:00:00.000000000 -0800
-+++ include/stuff/ofile.h 1969-12-31 16:00:00.000000000 -0800
-@@ -216,4 +216,11 @@ __private_extern__ void Mach_O_error(
- #endif
- ;
-
-+#ifdef LTO_SUPPORT
-+__private_extern__ int is_llvm_bitcode(
-+ struct ofile *ofile,
-+ char *addr,
-+ size_t size);
-+#endif /* LTO_SUPPORT */
-+
- #endif /* _STUFF_OFILE_H_ */
-diff -Naurp libstuff/lto.c libstuff/lto.c
---- libstuff/lto.c 1969-12-31 16:00:00.000000000 -0800
-+++ libstuff/lto.c 1969-12-31 16:00:00.000000000 -0800
-@@ -12,8 +12,8 @@
- #include <mach-o/nlist.h>
- #include <mach-o/dyld.h>
-
--static int set_lto_cputype(
-- struct ofile *ofile,
-+static int get_lto_cputype(
-+ struct arch_flag *arch_flag,
- char *target_triple);
-
- static int tried_to_load_lto = 0;
-@@ -39,9 +39,7 @@ struct ofile *ofile,
- char *addr,
- size_t size)
- {
-- size_t bufsize;
-- char *p, *prefix, *lto_path, buf[MAXPATHLEN], resolved_name[PATH_MAX];
-- int i;
-+ struct arch_flag arch_flag;
-
- /*
- * If this is an llvm bitcode file these will be filled in.
-@@ -55,6 +53,35 @@ size_t size)
- *"llvm bitcode file" could be in an archive or fat file.
- */
-
-+ if(is_llvm_bitcode_from_memory(addr, size, &arch_flag,
-+ &ofile->lto) != 0){
-+ ofile->lto_cputype = arch_flag.cputype;
-+ ofile->lto_cpusubtype = arch_flag.cpusubtype;
-+ return(1);
-+ }
-+ return(0);
-+}
-+
-+/*
-+ * is_llvm_bitcode_from_memory() is passed a pointer and size of a memory
-+ * buffer, a pointer to an arch_flag struct and an pointer to return the lto
-+ * module if not NULL. If it the memory is an llvm bit code it returns 1 and
-+ * sets the fields in the arch flag. If pmod is not NULL it stores the lto
-+ * module in their, if not it frees the lto module. If the memory buffer is
-+ * not an llvm bit code it returns 0.
-+ */
-+__private_extern__ int is_llvm_bitcode_from_memory(
-+char *addr,
-+uint32_t size,
-+struct arch_flag *arch_flag,
-+void **pmod) /* maybe NULL */
-+{
-+
-+ size_t bufsize;
-+ char *p, *prefix, *lto_path, buf[MAXPATHLEN], resolved_name[PATH_MAX];
-+ int i;
-+ void *mod;
-+
- /*
- * The libLTO API's can't handle empty files. So return 0 to indicate
- * this is not a bitcode file if it has a zero size.
-@@ -131,33 +158,40 @@ size_t size)
- if(!lto_is_object(addr, size))
- return(0);
-
-- ofile->lto = lto_create(addr, size);
-- if(ofile->lto == NULL)
-+ mod = lto_create(addr, size);
-+ if(mod == NULL)
- return(0);
-
- /*
- * It is possible for new targets to be added to lto that are not yet
- * known to this code. So we will try to get lucky and let them pass
-- * through with the lto_cputype set to 0. This should work for things
-+ * through with the cputype set to 0. This should work for things
- * like libtool(1) as long as we don't get two different unknown
- * targets. But we'll hope that just doesn't happen.
- */
-- set_lto_cputype(ofile, lto_get_target(ofile->lto));
-+ arch_flag->cputype = 0;
-+ arch_flag->cpusubtype = 0;
-+ arch_flag->name = NULL;
-+ (void)get_lto_cputype(arch_flag, lto_get_target(mod));
-+
-+ if(pmod != NULL)
-+ *pmod = mod;
-+ else
-+ lto_free(mod);
-
- return(1);
- }
-
- /*
-- * set_lto_cputype() takes an ofile pointer and the target_triple string
-- * returned from lto_module_get_target_triple() and sets the fields lto_cputype
-- * and lto_cpusubtype in the ofile pointer. If it can parse and knows the
-- * strings values it returns 1 and the fields are set. Otherwise it returns 0
-- * and the fields are not set.
-+ * get_lto_cputype() takes an arch_flag pointer and the target_triple string
-+ * returned from lto_module_get_target_triple() and sets the fields in the
-+ * arch_flag. If it can parse and knows the strings values it returns 1 and
-+ * the fields are set. Otherwise it returns 0 and the fields are not set.
- */
- static
- int
--set_lto_cputype(
--struct ofile *ofile,
-+get_lto_cputype(
-+struct arch_flag *arch_flag,
- char *target_triple)
- {
- char *p;
-@@ -171,45 +205,47 @@ char *target_triple)
- n = p - target_triple;
- if(strncmp(target_triple, "i686", n) == 0 ||
- strncmp(target_triple, "i386", n) == 0){
-- ofile->lto_cputype = CPU_TYPE_I386;
-- ofile->lto_cpusubtype = CPU_SUBTYPE_I386_ALL;
-+ arch_flag->cputype = CPU_TYPE_I386;
-+ arch_flag->cpusubtype = CPU_SUBTYPE_I386_ALL;
- }
- else if(strncmp(target_triple, "x86_64", n) == 0){
-- ofile->lto_cputype = CPU_TYPE_X86_64;
-- ofile->lto_cpusubtype = CPU_SUBTYPE_X86_64_ALL;
-+ arch_flag->cputype = CPU_TYPE_X86_64;
-+ arch_flag->cpusubtype = CPU_SUBTYPE_X86_64_ALL;
- }
- else if(strncmp(target_triple, "powerpc", n) == 0){
-- ofile->lto_cputype = CPU_TYPE_POWERPC;
-- ofile->lto_cpusubtype = CPU_SUBTYPE_POWERPC_ALL;
-+ arch_flag->cputype = CPU_TYPE_POWERPC;
-+ arch_flag->cpusubtype = CPU_SUBTYPE_POWERPC_ALL;
- }
- else if(strncmp(target_triple, "powerpc64", n) == 0){
-- ofile->lto_cputype = CPU_TYPE_POWERPC64;
-- ofile->lto_cpusubtype = CPU_SUBTYPE_POWERPC_ALL;
-+ arch_flag->cputype = CPU_TYPE_POWERPC64;
-+ arch_flag->cpusubtype = CPU_SUBTYPE_POWERPC_ALL;
- }
- else if(strncmp(target_triple, "arm", n) == 0){
-- ofile->lto_cputype = CPU_TYPE_ARM;
-- ofile->lto_cpusubtype = CPU_SUBTYPE_ARM_V4T;
-+ arch_flag->cputype = CPU_TYPE_ARM;
-+ arch_flag->cpusubtype = CPU_SUBTYPE_ARM_V4T;
- }
- else if(strncmp(target_triple, "armv5", n) == 0 ||
- strncmp(target_triple, "armv5e", n) == 0 ||
- strncmp(target_triple, "thumbv5", n) == 0 ||
- strncmp(target_triple, "thumbv5e", n) == 0){
-- ofile->lto_cputype = CPU_TYPE_ARM;
-- ofile->lto_cpusubtype = CPU_SUBTYPE_ARM_V5TEJ;
-+ arch_flag->cputype = CPU_TYPE_ARM;
-+ arch_flag->cpusubtype = CPU_SUBTYPE_ARM_V5TEJ;
- }
- else if(strncmp(target_triple, "armv6", n) == 0 ||
- strncmp(target_triple, "thumbv6", n) == 0){
-- ofile->lto_cputype = CPU_TYPE_ARM;
-- ofile->lto_cpusubtype = CPU_SUBTYPE_ARM_V6;
-+ arch_flag->cputype = CPU_TYPE_ARM;
-+ arch_flag->cpusubtype = CPU_SUBTYPE_ARM_V6;
- }
- else if(strncmp(target_triple, "armv7", n) == 0 ||
- strncmp(target_triple, "thumbv7", n) == 0){
-- ofile->lto_cputype = CPU_TYPE_ARM;
-- ofile->lto_cpusubtype = CPU_SUBTYPE_ARM_V7;
-+ arch_flag->cputype = CPU_TYPE_ARM;
-+ arch_flag->cpusubtype = CPU_SUBTYPE_ARM_V7;
- }
- else{
- return(0);
- }
-+ arch_flag->name = (char *)get_arch_name_from_types(arch_flag->cputype,
-+ arch_flag->cpusubtype);
- return(1);
- }
-
-diff -Naurp misc/lipo.c misc/lipo.c
---- misc/lipo.c 1969-12-31 16:00:00.000000000 -0800
-+++ misc/lipo.c 1969-12-31 16:00:00.000000000 -0800
-@@ -61,6 +61,7 @@
- #include "stuff/arch.h"
- #include "stuff/errors.h"
- #include "stuff/allocate.h"
-+#include "stuff/lto.h"
-
- /* The maximum section alignment allowed to be specified, as a power of two */
- #define MAXSECTALIGN 15 /* 2**15 or 0x8000 */
-@@ -1190,8 +1191,21 @@ struct input_file *input)
- thin->fat_arch.align = 0;
- }
- else{
-- fatal("can't figure out the architecture type of: %s",
-- input->name);
-+ if(is_llvm_bitcode_from_memory(addr, size, &input->arch_flag,
-+ NULL) != 0){
-+ /* create a thin file struct for it */
-+ thin = new_thin();
-+ thin->name = input->name;
-+ thin->addr = addr;
-+ thin->fat_arch.cputype = input->arch_flag.cputype;
-+ thin->fat_arch.cpusubtype = input->arch_flag.cpusubtype;
-+ thin->fat_arch.offset = 0;
-+ thin->fat_arch.size = size;
-+ thin->fat_arch.align = 0;
-+ }
-+ else
-+ fatal("can't figure out the architecture type of: %s",
-+ input->name);
- }
- }
- }
-@@ -1344,11 +1358,12 @@ uint32_t size,
- cpu_type_t *cputype,
- cpu_subtype_t *cpusubtype)
- {
-- uint32_t offset, magic, i, ar_name_size;
-+ uint32_t offset, magic, i, ar_name_size, ar_size;
- struct mach_header mh;
- struct mach_header_64 mh64;
- struct ar_hdr *ar_hdr;
-- char *ar_name;
-+ char *ar_name, *ar_addr;
-+ struct arch_flag arch_flag;
-
- /*
- * Check this archive out to make sure that it does not contain
-@@ -1425,7 +1440,30 @@ cpu_subtype_t *cpusubtype)
- ~CPU_SUBTYPE_MASK);
- }
- }
-- }
-+ else{
-+ if(strncmp(ar_name, SYMDEF, sizeof(SYMDEF) - 1) != 0){
-+ ar_addr = addr + offset + ar_name_size;
-+ ar_size = strtoul(ar_hdr->ar_size, NULL, 10);
-+ if(is_llvm_bitcode_from_memory(ar_addr, ar_size,
-+ &arch_flag, NULL) != 0){
-+ if(*cputype == 0){
-+ *cputype = arch_flag.cputype;
-+ *cpusubtype = arch_flag.cpusubtype;
-+ }
-+ else if(*cputype != arch_flag.cputype){
-+ fatal("archive member %s(%.*s) cputype (%d) "
-+ "and cpusubtype (%d) does not match "
-+ "previous archive members cputype (%d) "
-+ "and cpusubtype (%d) (all members must "
-+ "match)", name, (int)i, ar_name,
-+ arch_flag.cputype, arch_flag.cpusubtype &
-+ ~CPU_SUBTYPE_MASK, *cputype,
-+ (*cpusubtype) & ~CPU_SUBTYPE_MASK);
-+ }
-+ }
-+ }
-+ }
-+ }
- offset += rnd(strtoul(ar_hdr->ar_size, NULL, 10),
- sizeof(short));
- }
Deleted: trunk/dports/devel/cctools/files/PR-9830754.patch
===================================================================
--- trunk/dports/devel/cctools/files/PR-9830754.patch 2015-02-13 01:49:28 UTC (rev 132914)
+++ trunk/dports/devel/cctools/files/PR-9830754.patch 2015-02-13 08:51:03 UTC (rev 132915)
@@ -1,12 +0,0 @@
-diff -Naurp misc/libtool.c misc/libtool.c
---- misc/libtool.c 1969-12-31 16:00:00.000000000 -0800
-+++ misc/libtool.c 1969-12-31 16:00:00.000000000 -0800
-@@ -2326,7 +2326,7 @@ struct ofile *ofile)
- if(archs[0].members[j].offset ==
- archs[0].toc_ranlibs[i].ran_off){
- archs[0].toc_ranlibs[i].ran_off =
-- archs[0].members[i].input_member_offset;
-+ archs[0].members[j].input_member_offset;
- break;
- }
- }
Deleted: trunk/dports/devel/cctools/files/cctools-806-lto.patch
===================================================================
--- trunk/dports/devel/cctools/files/cctools-806-lto.patch 2015-02-13 01:49:28 UTC (rev 132914)
+++ trunk/dports/devel/cctools/files/cctools-806-lto.patch 2015-02-13 08:51:03 UTC (rev 132915)
@@ -1,35 +0,0 @@
---- libstuff/lto.c.orig 2012-04-20 22:44:19.000000000 -0700
-+++ libstuff/lto.c 2012-04-20 22:51:04.000000000 -0700
-@@ -119,11 +119,19 @@ void **pmod) /* maybe NULL */
- lto_path = makestr(prefix, "../lib/libLTO.dylib", NULL);
-
- lto_handle = dlopen(lto_path, RTLD_NOW);
-+ free(lto_path);
- if(lto_handle == NULL){
-- free(lto_path);
-- lto_path = NULL;
-- lto_handle = dlopen("/Developer/usr/lib/libLTO.dylib",
-- RTLD_NOW);
-+ const char *lto_paths[] = {
-+ "@@LLVM_LIBDIR@@/libLTO.dylib",
-+ "/Developer/usr/lib/libLTO.dylib",
-+ "/usr/lib/libLTO.dylib",
-+ "/Applications/Xcode.app/usr/lib/libLTO.dylib",
-+ NULL
-+ };
-+ const char **p;
-+ for(p = lto_paths; *p && !lto_handle ; p++) {
-+ lto_handle = dlopen(*p, RTLD_NOW);
-+ }
- }
- if(lto_handle == NULL)
- return(0);
-@@ -147,8 +154,6 @@ void **pmod) /* maybe NULL */
- lto_get_sym_attr == NULL ||
- lto_get_sym_name == NULL){
- dlclose(lto_handle);
-- if(lto_path != NULL)
-- free(lto_path);
- return(0);
- }
- }
Deleted: trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch
===================================================================
--- trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch 2015-02-13 01:49:28 UTC (rev 132914)
+++ trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch 2015-02-13 08:51:03 UTC (rev 132915)
@@ -1,32 +0,0 @@
---- 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 */
Deleted: trunk/dports/devel/cctools/files/cctools-822-no-lto.patch
===================================================================
--- trunk/dports/devel/cctools/files/cctools-822-no-lto.patch 2015-02-13 01:49:28 UTC (rev 132914)
+++ trunk/dports/devel/cctools/files/cctools-822-no-lto.patch 2015-02-13 08:51:03 UTC (rev 132915)
@@ -1,34 +0,0 @@
---- misc/lipo.c.orig 2012-04-22 03:41:01.000000000 -0700
-+++ misc/lipo.c 2012-04-22 03:42:03.000000000 -0700
-@@ -1195,6 +1195,7 @@ struct input_file *input)
- thin->fat_arch.align = 0;
- }
- else{
-+#ifdef LTO_SUPPORT
- if(is_llvm_bitcode_from_memory(addr, size, &input->arch_flag,
- NULL) != 0){
- /* create a thin file struct for it */
-@@ -1208,6 +1209,7 @@ struct input_file *input)
- thin->fat_arch.align = 0;
- }
- else
-+#endif
- fatal("can't figure out the architecture type of: %s",
- input->name);
- }
-@@ -1448,6 +1450,7 @@ cpu_subtype_t *cpusubtype)
- if(strncmp(ar_name, SYMDEF, sizeof(SYMDEF) - 1) != 0){
- ar_addr = addr + offset + ar_name_size;
- ar_size = strtoul(ar_hdr->ar_size, NULL, 10);
-+#ifdef LTO_SUPPORT
- if(is_llvm_bitcode_from_memory(ar_addr, ar_size,
- &arch_flag, NULL) != 0){
- if(*cputype == 0){
-@@ -1465,6 +1468,7 @@ cpu_subtype_t *cpusubtype)
- (*cpusubtype) & ~CPU_SUBTYPE_MASK);
- }
- }
-+#endif
- }
- }
- }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150213/adf43407/attachment-0001.html>
More information about the macports-changes
mailing list