[yocto] [PATCH 2/2] meta-darwin on dylan branch

[Woodyatt, James]

commit 4c50f7bd62a675dd1f034bc6730f833c6dca0c19
Author: james woodyatt <james.woodyatt at intel.com>
Date:   Thu May 1 11:57:41 2014 -0700

    Remove usage of ‘new typename’ constructors in ld64 part of odcctools2 package.

diff --git a/recipes-devtools/odcctools/files/ld64-typename.patch b/recipes-devtools/odcctools/files/ld64-typename.patch
new file mode 100644
index 0000000..ef5d95d
--- /dev/null
+++ b/recipes-devtools/odcctools/files/ld64-typename.patch
@@ -0,0 +1,69 @@
+diff -r -U 3 apple-x86-odcctools-758.159.orig/ld64/src/ld.cpp apple-x86-odcctools-758.159/ld64/src/ld.cpp
+--- apple-x86-odcctools-758.159.orig/ld64/src/ld.cpp	2014-04-30 12:05:13.106000001 -0700
++++ apple-x86-odcctools-758.159/ld64/src/ld.cpp	2014-04-30 12:06:19.221000001 -0700
+@@ -2914,49 +2914,49 @@
+ 	switch (fArchitecture) {
+ 		case CPU_TYPE_POWERPC:
+ 			if ( mach_o::relocatable::Reader<ppc>::validFile(p) )
+-				return this->addObject(new typename mach_o::relocatable::Reader<ppc>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addObject(new mach_o::relocatable::Reader<ppc>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( mach_o::dylib::Reader<ppc>::validFile(p, info.options.fBundleLoader) )
+-				return this->addDylib(new typename mach_o::dylib::Reader<ppc>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addDylib(new mach_o::dylib::Reader<ppc>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( archive::Reader<ppc>::validFile(p, len) )
+-				return this->addArchive(new typename archive::Reader<ppc>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addArchive(new archive::Reader<ppc>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			break;
+ 		case CPU_TYPE_POWERPC64:
+ 			if ( mach_o::relocatable::Reader<ppc64>::validFile(p) )
+-				return this->addObject(new typename mach_o::relocatable::Reader<ppc64>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addObject(new mach_o::relocatable::Reader<ppc64>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( mach_o::dylib::Reader<ppc64>::validFile(p, info.options.fBundleLoader) )
+-				return this->addDylib(new typename mach_o::dylib::Reader<ppc64>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addDylib(new mach_o::dylib::Reader<ppc64>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( archive::Reader<ppc64>::validFile(p, len) )
+-				return this->addArchive(new typename archive::Reader<ppc64>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addArchive(new archive::Reader<ppc64>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			break;
+ 		case CPU_TYPE_I386:
+ 			if ( mach_o::relocatable::Reader<x86>::validFile(p) )
+-				return this->addObject(new typename mach_o::relocatable::Reader<x86>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addObject(new mach_o::relocatable::Reader<x86>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( mach_o::dylib::Reader<x86>::validFile(p, info.options.fBundleLoader) )
+-				return this->addDylib(new typename mach_o::dylib::Reader<x86>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addDylib(new mach_o::dylib::Reader<x86>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( archive::Reader<x86>::validFile(p, len) )
+-				return this->addArchive(new typename archive::Reader<x86>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addArchive(new archive::Reader<x86>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			break;
+ 		case CPU_TYPE_X86_64:
+ 			if ( mach_o::relocatable::Reader<x86_64>::validFile(p) )
+-				return this->addObject(new typename mach_o::relocatable::Reader<x86_64>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addObject(new mach_o::relocatable::Reader<x86_64>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( mach_o::dylib::Reader<x86_64>::validFile(p, info.options.fBundleLoader) )
+-				return this->addDylib(new typename mach_o::dylib::Reader<x86_64>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addDylib(new mach_o::dylib::Reader<x86_64>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( archive::Reader<x86_64>::validFile(p, len) )
+-				return this->addArchive(new typename archive::Reader<x86_64>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addArchive(new archive::Reader<x86_64>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 		case CPU_TYPE_ARM:
+ 			if ( mach_o::relocatable::Reader<arm>::validFile(p) )
+-				return this->addObject(new typename mach_o::relocatable::Reader<arm>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addObject(new mach_o::relocatable::Reader<arm>::Reader(p, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( mach_o::dylib::Reader<arm>::validFile(p, info.options.fBundleLoader) )
+-				return this->addDylib(new typename mach_o::dylib::Reader<arm>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addDylib(new mach_o::dylib::Reader<arm>::Reader(p, len, info.path, info.options, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			else if ( archive::Reader<arm>::validFile(p, len) )
+-				return this->addArchive(new typename archive::Reader<arm>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
++				return this->addArchive(new archive::Reader<arm>::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fNextInputOrdinal), info, len);
+ 			break;
+ 			break;
+ 	}
+ 
+ #if LTO_SUPPORT
+ 	if ( lto::Reader::validFile(p, len, fArchitecture) ) {
+-		return this->addObject(new typename lto::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fArchitecture), info, len);
++		return this->addObject(new lto::Reader(p, len, info.path, info.modTime, fOptions.readerOptions(), fArchitecture), info, len);
+ 	}
+ 	else if ( !lto::Reader::loaded() && (p[0] == 'B') && (p[1] == 'C')  ) {
+ 		throw "could not process object file.  Looks like an llvm bitcode object file, but libLTO.dylib could not be loaded";
diff --git a/recipes-devtools/odcctools/odcctools2-crosssdk_758.159.bb b/recipes-devtools/odcctools/odcctools2-crosssdk_758.159.bb
index 3c13e59..6c15d8c 100644
--- a/recipes-devtools/odcctools/odcctools2-crosssdk_758.159.bb
+++ b/recipes-devtools/odcctools/odcctools2-crosssdk_758.159.bb
@@ -4,7 +4,8 @@ SRC_URI = "file://apple-x86-odcctools_758.159-0flosoft11.tar.gz \
            file://fix-758.patch \
            file://vm_types_h.patch \
            file://as.patch \
-           file://arch_c.patch "
+           file://arch_c.patch \
+           file://ld64-typename.patch"
 LICENSE = "ApplePSLicense-2.0"
 
 S = "${WORKDIR}/apple-x86-odcctools-758.159"

—
james woodyatt <james.woodyatt at intel.com>
Software Architect, New Devices Group