diff --git a/libs/cyrus-sasl/cyrus-sasl.py b/libs/cyrus-sasl/cyrus-sasl.py index ba87d457..c0ff00df 100644 --- a/libs/cyrus-sasl/cyrus-sasl.py +++ b/libs/cyrus-sasl/cyrus-sasl.py @@ -1,44 +1,44 @@ import info from Package.CMakePackageBase import * # see http://wiki.mozilla.org/LDAP_C_SDK_SASL_Windows class subinfo(info.infoclass): def setTargets(self): for ver in ["2.1.26"]: self.targets[ver] = "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" + ver + ".tar.gz" self.targetInstSrc[ver] = "cyrus-sasl-" + ver if CraftCore.compiler.isWindows: self.patchToApply["2.1.26"] = [("cyrus-sasl-2.1.26.patch", 1)] else: #http://www.linuxfromscratch.org/blfs/view/svn/postlfs/cyrus-sasl.html - self.patchToApply["2.1.26"] = [("cyrus-sasl-2.1.26-fixes-3.patch", 1) + self.patchToApply["2.1.26"] = [("cyrus-sasl-2.1.26-fixes-3.patch", 1), ("cyrus-sasl-2.1.26-openssl-1.1.0-1.patch", 1)] self.targetDigests["2.1.26"] = "d6669fb91434192529bd13ee95737a8a5040241c" self.description = "Cyrus SASL implementation" self.defaultTarget = "2.1.26" def setDependencies(self): self.runtimeDependencies["virtual/base"] = "default" class CMakePackage(CMakePackageBase): def __init__(self, **args): # self.subinfo.options.configure.args = "-DSTATIC_LIBRARY=OFF" CMakePackageBase.__init__(self) from Package.AutoToolsPackageBase import * class PackageAutotools(AutoToolsPackageBase): def __init__(self, **args): AutoToolsPackageBase.__init__(self) if CraftCore.compiler.isWindows: class Package(CMakePackageBase): pass else: class Package(PackageAutotools): pass