diff --git a/libs/llvm-meta/llvm/llvm-6.0.1-20181019.diff b/libs/llvm-meta/llvm/llvm-6.0.1-20181019.diff new file mode 100644 index 00000000..24a5678c --- /dev/null +++ b/libs/llvm-meta/llvm/llvm-6.0.1-20181019.diff @@ -0,0 +1,12 @@ +diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' llvm-6.0.1.src.orig/cmake/config-ix.cmake llvm-6.0.1.src/cmake/config-ix.cmake +--- llvm-6.0.1.src.orig/cmake/config-ix.cmake 2018-01-02 18:53:08.000000000 +0100 ++++ llvm-6.0.1.src/cmake/config-ix.cmake 2018-10-19 14:08:38.376293100 +0200 +@@ -174,7 +174,7 @@ + if (LIBXML2_FOUND) + set(LLVM_LIBXML2_ENABLED 1) + include_directories(${LIBXML2_INCLUDE_DIR}) +- set(LIBXML2_LIBS "xml2") ++ set(LIBXML2_LIBS ${LIBXML2_LIBRARIES}) + endif() + endif() + endif() diff --git a/libs/llvm-meta/llvm/llvm.py b/libs/llvm-meta/llvm/llvm.py index 5dd0a35b..62189624 100644 --- a/libs/llvm-meta/llvm/llvm.py +++ b/libs/llvm-meta/llvm/llvm.py @@ -1,95 +1,96 @@ # -*- coding: utf-8 -*- import info from Package import CMakePackageBase class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() self.patchLevel["5.0.1"] = 2 self.patchLevel["6.0.0"] = 2 + self.patchToApply["6.0.1"] = [("llvm-6.0.1-20181019.diff", 1)] def setDependencies(self): self.runtimeDependencies["virtual/base"] = None self.buildDependencies["libs/libxml2"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self, **args): CMakePackageBase.__init__(self) self.supportsClang = False self.subinfo.options.configure.args = "-DLLVM_TARGETS_TO_BUILD='host'" # BEGIN: sub-package handling self.subPackages = [] def maybeAddSubPackage(pkg, cmakeDefine): if not pkg.isIgnored(): self.subinfo.options.configure.args += f" -D{cmakeDefine}=\"{OsUtils.toUnixPath(pkg.instance.sourceDir())}\"" self.subPackages.append(pkg.instance) maybeAddSubPackage(CraftPackageObject.get('libs/llvm-meta/clang'), "LLVM_EXTERNAL_CLANG_SOURCE_DIR") maybeAddSubPackage(CraftPackageObject.get('libs/llvm-meta/clang-tools-extra'), "LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR") maybeAddSubPackage(CraftPackageObject.get('libs/llvm-meta/lld'), "LLVM_EXTERNAL_LLD_SOURCE_DIR") # END: sub-package handling if CraftCore.compiler.isMSVC(): self.subinfo.options.configure.args += " -DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON" else: self.subinfo.options.configure.args += " -DBUILD_SHARED_LIBS=ON" # lldb by default needs SWIG for the Python integration # disable this support until we have a swig package in Craft self.subinfo.options.configure.args += " -DLLDB_DISABLE_PYTHON=ON" def fetch(self): if not CMakePackageBase.fetch(self): return False for p in self.subPackages: if not p.fetch(noop=False): return False return True def unpack(self): if not CMakePackageBase.unpack(self): return False for p in self.subPackages: if not p.unpack(noop=False): return False return True def install(self): if not CMakePackageBase.install(self): return False if CraftCore.compiler.isMinGW(): files = os.listdir(os.path.join(self.buildDir(), "lib")) for f in files: if f.endswith("dll.a"): src = os.path.join(self.buildDir(), "lib", f) dest = os.path.join(self.installDir(), "lib", f) if not os.path.exists(dest): utils.copyFile(src, dest, False) elif CraftCore.compiler.isMSVC(): utils.copyFile(os.path.join(self.buildDir(), "lib", "clang.lib"), os.path.join(self.installDir(), "lib", "craft_clang_plugins.lib")) # the build system is broken so.... src = os.path.join(self.installDir(), "bin", f"clang{CraftCore.compiler.executableSuffix}") def maybeCopy(dest): dest = f"{dest}{CraftCore.compiler.executableSuffix}" if not os.path.exists(dest): return utils.copyFile(src, dest) else: return True if CraftCore.compiler.isMSVC(): if not maybeCopy(os.path.join(self.installDir(), "bin", "clang-cl")): return False return maybeCopy(os.path.join(self.installDir(), "bin", "clang++"))