[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [emerge] portage/win32libs/openssl: update openssl and change configuration on mingw
From: Patrick von Reth <vonreth () kde ! org>
Date: 2015-06-15 13:06:22
Message-ID: E1Z4U5m-00014m-Kt () scm ! kde ! org
[Download RAW message or body]
Git commit 5b59707877245b21fedbe79721ca3a81d1e7a411 by Patrick von Reth.
Committed on 15/06/2015 at 13:04.
Pushed by vonreth into branch 'master'.
update openssl and change configuration on mingw
M +73 -70 portage/win32libs/openssl/openssl.py
http://commits.kde.org/emerge/5b59707877245b21fedbe79721ca3a81d1e7a411
diff --git a/portage/win32libs/openssl/openssl.py \
b/portage/win32libs/openssl/openssl.py index 8780dd7..ed1a65b 100644
--- a/portage/win32libs/openssl/openssl.py
+++ b/portage/win32libs/openssl/openssl.py
@@ -6,97 +6,97 @@ import info
import compiler
-class subinfo( info.infoclass ):
-
- def setTargets( self ):
+class subinfo(info.infoclass):
+ def setTargets(self):
# The deref version is a repackaged tarball of 1.0.0d
# creation of this tarball was done on a secure machine
# and the sources are exactly the same. Packaged
# with GNU Tar options: tar --dereference -czf to avoid
# problems with symlinks on windows
-
+
# TODO: Patch this to use icl.exe when compiler.isIntel()
# As this is pure C, there should be no problem with building it with cl.exe \
by now
-
- self.targets[ '1.0.0d' ] = \
('https://downloads.sourceforge.net/project/kde-windows'
- \
'/openssl/1.0.0d/openssl-1.0.0d-orig-deref-src.tar.gz')
- self.targetInstSrc[ '1.0.0d' ] = 'openssl-1.0.0d'
+
+ self.targets['1.0.0d'] = \
('https://downloads.sourceforge.net/project/kde-windows' + \
'/openssl/1.0.0d/openssl-1.0.0d-orig-deref-src.tar.gz') + \
self.targetInstSrc['1.0.0d'] = 'openssl-1.0.0d' self.patchToApply['1.0.0d'] = \
('openssl-1.0.0d.diff', 1)
self.targetDigests['1.0.0d'] = '5c8472d09958c630eeb7548a1aeccb78fbd5cd10'
- for ver in [ '0.9.8k' , '0.9.8m' ,'1.0.0', '1.0.0a', '1.0.0b', '1.0.0c', \
'1.0.1c', '1.0.1e','1.0.1f','1.0.1g', '1.0.1h', '1.0.1i', '1.0.1j', '1.0.1k', \
'1.0.2a']:
- self.targets[ ver ] = 'http://www.openssl.org/source/openssl-' + ver + \
'.tar.gz'
- self.targetInstSrc[ ver ] = 'openssl-' + ver
- #if compiler.isMSVC() and ver not in [ '0.9.8k' , '0.9.8m' ,'1.0.0', \
'1.0.0a', '1.0.0b', '1.0.0c' ]:
- #self.patchToApply[ ver ] = ('openssl-with-pdbs.diff', 1)
+ for ver in ['0.9.8k', '0.9.8m', '1.0.0', '1.0.0a', '1.0.0b', '1.0.0c', \
'1.0.1c', '1.0.1e', + '1.0.1f', '1.0.1g', '1.0.1h', '1.0.1i', \
'1.0.1j', '1.0.1k', '1.0.2a', '1.0.2c']: + self.targets[ver] = \
'http://www.openssl.org/source/openssl-' + ver + '.tar.gz' + \
self.targetInstSrc[ver] = 'openssl-' + ver + # if compiler.isMSVC() and \
ver not in [ '0.9.8k' , '0.9.8m' ,'1.0.0', '1.0.0a', '1.0.0b', '1.0.0c' ]: + \
# self.patchToApply[ ver ] = ('openssl-with-pdbs.diff', 1)
if (compiler.isMSVC2013() or compiler.isMSVC2015()) and ver in \
['1.0.1k']:
- self.patchToApply[ ver ] = ('openssl-1.0.1k.diff', 1)
- self.targetDigestUrls[ ver ] = 'http://www.openssl.org/source/openssl-' \
+ ver + '.tar.gz.sha1'
- self.targets[ '1.0.1-snapshot' ] = \
'ftp://ftp.openssl.org/snapshot/openssl-1.0.1-stable-SNAP-20101028.tar.gz' + \
self.patchToApply[ver] = ('openssl-1.0.1k.diff', 1) + \
self.targetDigestUrls[ver] = 'http://www.openssl.org/source/openssl-' + ver + \
'.tar.gz.sha1' + self.targets['1.0.1-snapshot'] = \
'ftp://ftp.openssl.org/snapshot/openssl-1.0.1-stable-SNAP-20101028.tar.gz' \
self.shortDescription = "The OpenSSL runtime environment"
- self.defaultTarget = '1.0.2a'
-
+ self.defaultTarget = '1.0.2c'
+
if compiler.isMinGW_W64():
- self.patchToApply[ '1.0.0' ] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
- self.patchToApply[ '1.0.0a' ] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
- self.patchToApply[ '1.0.0b' ] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
- self.patchToApply[ '1.0.0c' ] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
- self.patchToApply[ '1.0.0d' ] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
+ self.patchToApply['1.0.0'] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
+ self.patchToApply['1.0.0a'] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
+ self.patchToApply['1.0.0b'] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
+ self.patchToApply['1.0.0c'] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
+ self.patchToApply['1.0.0d'] = ('openssl-1.0.0a-mingw64-asm.diff', 1)
- def setDependencies( self ):
- self.buildDependencies['virtual/base'] = 'default'
- self.buildDependencies['dev-util/perl'] = 'default'
- if compiler.isMinGW():
- self.buildDependencies['dev-util/msys'] = 'default'
- self.dependencies['win32libs/zlib'] = 'default'
+ def setDependencies(self):
+ self.buildDependencies['virtual/base'] = 'default'
+ self.buildDependencies['dev-util/perl'] = 'default'
+ if compiler.isMinGW():
+ self.buildDependencies['dev-util/msys'] = 'default'
+ self.dependencies['win32libs/zlib'] = 'default'
from Package.CMakePackageBase import *
+
class PackageCMake(CMakePackageBase):
- def __init__( self, **args ):
+ def __init__(self, **args):
CMakePackageBase.__init__(self)
self.staticBuild = False
- def compile( self ):
- os.chdir( self.sourceDir() )
+ def compile(self):
+ os.chdir(self.sourceDir())
cmd = ""
if compiler.isX64():
config = "VC-WIN64A"
else:
config = "VC-WIN32"
- if not self.system( "perl Configure %s" % config, "configure" ):
+ if not self.system("perl Configure %s" % config, "configure"):
return False
if compiler.isX64():
- if not self.system( "ms\do_win64a.bat", "configure" ):
+ if not self.system("ms\do_win64a.bat", "configure"):
return False
else:
- if not self.system( "ms\do_ms.bat", "configure" ):
+ if not self.system("ms\do_ms.bat", "configure"):
return False
-
if self.staticBuild:
cmd = r"nmake -f ms\nt.mak"
else:
cmd = r"nmake -f ms\ntdll.mak"
- return self.system( cmd )
+ return self.system(cmd)
- def install( self ):
+ def install(self):
src = self.sourceDir()
dst = self.imageDir()
- if not os.path.isdir( dst ):
- os.mkdir( dst )
- if not os.path.isdir( os.path.join( dst, "bin" ) ):
- os.mkdir( os.path.join( dst, "bin" ) )
- if not os.path.isdir( os.path.join( dst, "lib" ) ):
- os.mkdir( os.path.join( dst, "lib" ) )
- if not os.path.isdir( os.path.join( dst, "include" ) ):
- os.mkdir( os.path.join( dst, "include" ) )
+ if not os.path.isdir(dst):
+ os.mkdir(dst)
+ if not os.path.isdir(os.path.join(dst, "bin")):
+ os.mkdir(os.path.join(dst, "bin"))
+ if not os.path.isdir(os.path.join(dst, "lib")):
+ os.mkdir(os.path.join(dst, "lib"))
+ if not os.path.isdir(os.path.join(dst, "include")):
+ os.mkdir(os.path.join(dst, "include"))
if self.staticBuild:
outdir = "out32"
@@ -104,19 +104,20 @@ class PackageCMake(CMakePackageBase):
outdir = "out32dll"
if not self.staticBuild:
- shutil.copy( os.path.join( src, outdir, "libeay32.dll" ) , os.path.join( \
dst, "bin" ) )
- shutil.copy( os.path.join( src, outdir, "ssleay32.dll" ) , os.path.join( \
dst, "bin" ) )
- shutil.copy( os.path.join( src, outdir, "libeay32.lib" ) , os.path.join( \
dst, "lib" ) )
- shutil.copy( os.path.join( src, outdir, "ssleay32.lib" ) , os.path.join( \
dst, "lib" ) )
- utils.copySrcDirToDestDir( os.path.join( src, "include" ) , os.path.join( \
dst, "include" ) ) + shutil.copy(os.path.join(src, outdir, \
"libeay32.dll"), os.path.join(dst, "bin")) + shutil.copy(os.path.join(src, \
outdir, "ssleay32.dll"), os.path.join(dst, "bin")) + \
shutil.copy(os.path.join(src, outdir, "libeay32.lib"), os.path.join(dst, "lib")) + \
shutil.copy(os.path.join(src, outdir, "ssleay32.lib"), os.path.join(dst, "lib")) + \
utils.copySrcDirToDestDir(os.path.join(src, "include"), os.path.join(dst, "include")) \
return True
from Package.AutoToolsPackageBase import *
+
class PackageMSys(AutoToolsPackageBase):
- def __init__( self ):
+ def __init__(self):
AutoToolsPackageBase.__init__(self)
self.subinfo.options.make.supportsMultijob = False
self.subinfo.options.package.packageName = 'openssl'
@@ -130,32 +131,34 @@ class PackageMSys(AutoToolsPackageBase):
self.buildInSource = True
# target install needs perl with native path on configure time
- self.subinfo.options.configure.defines = " shared enable-md2 zlib-dynamic "
+ self.subinfo.options.configure.defines = " shared zlib-dynamic \
enable-camellia enable-idea enable-mdc2 enable-tlsext enable-rfc3779"
- def make( self, dummyBuildType=None ):
- return self.shell.execute(self.sourceDir(), self.makeProgram , "depend") \
and\
- AutoToolsPackageBase.make(self, dummyBuildType)
+def make(self, dummyBuildType=None):
+ return self.shell.execute(self.sourceDir(), self.makeProgram, "depend") and \
+ AutoToolsPackageBase.make(self, dummyBuildType)
- def install (self):
- self.enterSourceDir()
- self.shell.execute(self.sourceDir(), self.makeProgram, "INSTALLTOP=%s \
install_sw" % (self.shell.toNativePath(self.imageDir())))
- self.shell.execute(os.path.join( self.imageDir() , "lib"), "chmod" ,"664 *")
- self.shell.execute(os.path.join( self.imageDir() , "lib" , "engines" ), \
"chmod" , "755 *")
- shutil.move( os.path.join( self.imageDir(), "lib" , "libcrypto.dll.a" ) , \
os.path.join( self.imageDir() , "lib" , "libeay32.dll.a" ) )
- shutil.move( os.path.join( self.imageDir(), "lib" , "libssl.dll.a" ) , \
os.path.join( self.imageDir() , "lib" , "ssleay32.dll.a" ) )
- return True
+def install(self):
+ self.enterSourceDir()
+ self.shell.execute(self.sourceDir(), self.makeProgram,
+ "INSTALLTOP=%s install_sw" % \
(self.shell.toNativePath(self.imageDir()))) + \
self.shell.execute(os.path.join(self.imageDir(), "lib"), "chmod", "-R 664 .") + \
self.shell.execute(os.path.join(self.imageDir(), "lib", "engines"), "chmod", " -R 755 \
.") + self.shell.execute(os.path.join(self.imageDir(), "bin"), "chmod", " -R 755 \
.") + shutil.move(os.path.join(self.imageDir(), "lib", "libcrypto.dll.a"),
+ os.path.join(self.imageDir(), "lib", "libeay32.dll.a"))
+ shutil.move(os.path.join(self.imageDir(), "lib", "libssl.dll.a"),
+ os.path.join(self.imageDir(), "lib", "ssleay32.dll.a"))
+ return True
if compiler.isMinGW():
class Package(PackageMSys):
- def __init__( self ):
- PackageMSys.__init__( self )
+ def __init__(self):
+ PackageMSys.__init__(self)
else:
class Package(PackageCMake):
- def __init__( self ):
- PackageCMake.__init__( self )
-
-
+ def __init__(self):
+ PackageCMake.__init__(self)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic