Revision: 116828 https://trac.macports.org/changeset/116828 Author: jeremyhu@macports.org Date: 2014-02-07 23:05:21 -0800 (Fri, 07 Feb 2014) Log Message: ----------- cctools: Fix nm -m output Modified Paths: -------------- trunk/dports/devel/cctools/Portfile Added Paths: ----------- trunk/dports/devel/cctools/files/PR-12400897.patch Modified: trunk/dports/devel/cctools/Portfile =================================================================== --- trunk/dports/devel/cctools/Portfile 2014-02-08 02:19:29 UTC (rev 116827) +++ trunk/dports/devel/cctools/Portfile 2014-02-08 07:05:21 UTC (rev 116828) @@ -5,6 +5,7 @@ name cctools # OS X 10.9 version 845 +revision 1 categories devel platforms darwin maintainers jeremyhu openmaintainer @@ -26,14 +27,14 @@ depends_lib port:cctools-headers depends_build port:ld64 -patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch +patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch variant universal {} if {${os.arch} eq "powerpc" || ${os.major} < 9} { # XCode 4.1 version 806 - revision 2 + revision 3 distname cctools-${version} checksums rmd160 91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \ sha256 6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676 Added: trunk/dports/devel/cctools/files/PR-12400897.patch =================================================================== --- trunk/dports/devel/cctools/files/PR-12400897.patch (rev 0) +++ trunk/dports/devel/cctools/files/PR-12400897.patch 2014-02-08 07:05:21 UTC (rev 116828) @@ -0,0 +1,35 @@ +--- misc/nm.c 1969-12-31 16:00:00.000000000 -0800 ++++ misc/nm.c 2012-09-29 12:36:22.000000000 -0700 +@@ -496,7 +496,7 @@ void *cookie) + uint32_t nsymbols; + struct value_diff *value_diffs; + +- char *short_name, *has_suffix; ++ char *short_name, *suffix; + enum bool is_framework; + + cmd_flags = (struct cmd_flags *)cookie; +@@ -650,9 +650,20 @@ void *cookie) + process_flags.lib_names[j] = + (char *)dl + dl->dylib.name.offset; + short_name = guess_short_name(process_flags.lib_names[j], +- &is_framework, &has_suffix); +- if(short_name != NULL) +- process_flags.lib_names[j] = short_name; ++ &is_framework, &suffix); ++ if(short_name != NULL) { ++ if (suffix) { ++ char *combined_name; ++ asprintf(&combined_name, "%s%s", short_name, suffix); ++ if (combined_name) { ++ process_flags.lib_names[j] = combined_name; ++ free(short_name); ++ free(suffix); ++ } ++ } else { ++ process_flags.lib_names[j] = short_name; ++ } ++ } + j++; + } + lc = (struct load_command *)