diff --git a/portage/dev-util/mingw-w64-crt/mingw-w64-crt-20120725.py b/portage/dev-util/mingw-w64-crt/mingw-w64-crt-20120725.py index 945fd7cfb..9a0103211 100644 --- a/portage/dev-util/mingw-w64-crt/mingw-w64-crt-20120725.py +++ b/portage/dev-util/mingw-w64-crt/mingw-w64-crt-20120725.py @@ -1,42 +1,39 @@ import info from shells import * class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets['svnHEAD'] = 'https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk/mingw-w64-crt' self.defaultTarget = 'svnHEAD' def setDependencies( self ): self.buildDependencies['dev-util/msys'] = 'default' self.dependencies['dev-util/mingw-w64-headers'] = 'default' from Package.AutoToolsPackageBase import * class Package( AutoToolsPackageBase ): def __init__( self ): self.subinfo = subinfo() AutoToolsPackageBase.__init__( self ) if os.getenv("EMERGE_ARCHITECTURE") == "x64": target = "x86_64-w64-mingw32" disable = "--disable-lib32" self.subinfo.options.merge.destinationPath = 'mingw64/x86_64-w64-mingw32' else: target = "i686-w64-mingw32" disable = "--disable-lib64" self.subinfo.options.merge.destinationPath = 'mingw/i686-w64-mingw32' self.subinfo.options.configure.defines = " --with-sysroot=%s %s --target=%s " % (MSysShell().toNativePath(self.mergeDestinationDir()),disable, target) def install( self ): if not AutoToolsPackageBase.install( self ): return False if os.getenv("EMERGE_ARCHITECTURE") == "x64": - libdir = "lib64" - else: - libdir = "lib32" - shutil.move( os.path.join( self.installDir() , libdir ) , os.path.join( self.installDir(), "lib" ) ) + shutil.move( os.path.join( self.installDir() , "lib64" ) , os.path.join( self.installDir(), "lib" ) ) return True if __name__ == '__main__': Package().execute()