diff --git a/portage/libs/runtime/runtime.py b/portage/libs/runtime/runtime.py index 2ce3995f5..a866ebacb 100644 --- a/portage/libs/runtime/runtime.py +++ b/portage/libs/runtime/runtime.py @@ -1,56 +1,56 @@ import info from Package.VirtualPackageBase import VirtualPackageBase class subinfo( info.infoclass ): def setTargets( self ): # not used yet only for reference self.targets['master'] = "" self.shortDescription = "the mingw compiler runtime package" self.defaultTarget = 'master' def setDependencies( self ): self.buildDependencies[ 'virtual/base' ] = 'default' if compiler.isMinGW(): self.buildDependencies[ "dev-util/mingw-w64" ] = "default" from Package.BinaryPackageBase import * import compiler class PackageMinGW( BinaryPackageBase ): def __init__( self ): BinaryPackageBase.__init__( self ) - self.subinfo.options.package.version = compiler.getGCCVersion() + self.subinfo.options.package.version = compiler.getVersion() def fetch(self): return True def unpack( self ): destdir = os.path.join( self.sourceDir(), "bin" ) utils.createDir( self.sourceDir() ) utils.createDir( destdir ) if not OsUtils.isWin(): return True files = [ 'libgomp-1.dll', 'libstdc++-6.dll', 'libwinpthread-1.dll' ] if compiler.isMinGW_W32(): files.append('libgcc_s_sjlj-1.dll') srcdir = os.path.join( self.rootdir, "mingw", "bin" ) elif compiler.isMinGW_W64(): files.append('libgcc_s_seh-1.dll') srcdir = os.path.join( self.rootdir, "mingw64", "bin" ) for file in files: utils.copyFile( os.path.join( srcdir, file ), os.path.join( destdir, file ), linkOnly=False ) return True if compiler.isMinGW(): class Package(PackageMinGW): def __init__( self ): PackageMinGW.__init__( self ) else: class Package(VirtualPackageBase): pass diff --git a/portage/win32libs/pthreads/pthreads.py b/portage/win32libs/pthreads/pthreads.py index e1b671980..3ec228b26 100644 --- a/portage/win32libs/pthreads/pthreads.py +++ b/portage/win32libs/pthreads/pthreads.py @@ -1,39 +1,39 @@ import compiler import info class subinfo(info.infoclass): def setTargets( self ): for ver in ['2.8.0', '2.9.1']: ver2 = ver.replace('.', '-') self.targets[ver] = "ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-" + ver2 + "-release.tar.gz" self.targetInstSrc[ver] = 'pthreads-w32-' + ver2 + '-release' self.patchToApply['2.8.0'] = [('pthreads-w32-2-8-0-release-20110729.diff', 1)] self.patchToApply['2.9.1'] = [('pthreads-w32-2-9-1-release-20130901.diff', 1)] self.targetDigests['2.8.0'] = 'da8371cb20e8e238f96a1d0651212f154d84a9ac' self.targetDigests['2.9.1'] = '24d40e89c2e66a765733e8c98d6f94500343da86' self.shortDescription = 'a POSIX thread implementation for windows' self.defaultTarget = '2.9.1' def setDependencies( self ): self.dependencies['virtual/base'] = 'default' from Package.CMakePackageBase import * from Package.VirtualPackageBase import * class PthreadsPackage(CMakePackageBase): def __init__( self, **args ): CMakePackageBase.__init__(self) self.subinfo.options.configure.defines = " -DBUILD_TESTS=OFF" -if compiler.isMSVC() or compiler.isIntel() or compiler.getGCCVersion() == "4.4.7": +if compiler.isMSVC() or compiler.isIntel(): class Package(PthreadsPackage): def __init__( self ): PthreadsPackage.__init__( self ) else: class Package(VirtualPackageBase): def __init__( self ): VirtualPackageBase.__init__( self )