[freemat] 01/01: Fix llvm 3.8 build failure

Gianfranco Costamagna locutusofborg at moszumanska.debian.org
Fri Oct 7 08:10:55 UTC 2016


This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository freemat.

commit ec2e7ebc62d531d6051ca35c549499ddf7af2f65
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Fri Oct 7 10:04:02 2016 +0200

    Fix llvm 3.8 build failure
---
 debian/changelog                    | 10 ++++++++++
 debian/patches/fix-llvm-build.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 60949ef..fafc7db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+freemat (4.2+dfsg1-2) unstable; urgency=medium
+
+  * Team upload
+
+  [ Graham Inggs ]
+  * debian/patches/fix-llvm-build.patch:
+    - fix build failure with default llvm 3.8 (Closes: #833667)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 07 Oct 2016 10:01:50 +0200
+
 freemat (4.2+dfsg1-1) unstable; urgency=medium
 
   * Move from experimental to unstable.
diff --git a/debian/patches/fix-llvm-build.patch b/debian/patches/fix-llvm-build.patch
new file mode 100644
index 0000000..8f9ae09
--- /dev/null
+++ b/debian/patches/fix-llvm-build.patch
@@ -0,0 +1,26 @@
+Author: Graham Inggs <ginggs at debian.org>
+Description: Fix build failure with default llvm-3.8
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -258,7 +258,7 @@
+   link_directories(${LLVM_LIBRARY_DIRS})
+   llvm_map_components_to_libnames(REQ_LLVM_LIBRARIES executionengine option IRReader lto interpreter nativecodegen asmparser bitreader bitwriter codegen ipo linker selectiondag instrumentation)
+   
+-  set(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${CLANG_LIBRARIES};clang;clangAnalysis;clangApplyReplacements;clangARCMigrate;clangAST;clangASTMatchers;clangBasic;clangCodeGen;clangDriver;clangDynamicASTMatchers;clangEdit;clangFormat;clangFrontend;clangFrontendTool;clangIndex;clangLex;clangParse;clangQuery;clangRename;clangRewrite;clangRewriteFrontend;clangSema;clangSerialization;clangStaticAnalyzerCheckers;clangStaticAnalyzerCore;clangStaticAnalyzerFrontend;clangTidy;clangTidyGoogleModule;clangTi [...]
++  set(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${CLANG_LIBRARIES};clang;clangAnalysis;clangApplyReplacements;clangARCMigrate;clangAST;clangASTMatchers;clangBasic;clangCodeGen;clangDriver;clangDynamicASTMatchers;clangEdit;clangFormat;clangFrontend;clangFrontendTool;clangIndex;clangLex;clangParse;clangQuery;clangRename;clangRewrite;clangRewriteFrontend;clangSema;clangSerialization;clangStaticAnalyzerCheckers;clangStaticAnalyzerCore;clangStaticAnalyzerFrontend;clangTidy;clangTidyGoogleModule;clangTi [...]
+ ENDIF()
+ 
+ ##############################################################################
+--- a/libs/libMatC/CJitFuncClang.cpp
++++ b/libs/libMatC/CJitFuncClang.cpp
+@@ -17,9 +17,8 @@
+ 
+ #include "llvm/IR/LLVMContext.h"
+ #include "llvm/IR/Module.h"
+-#include "llvm/Config/config.h"
++#include "llvm/Config/llvm-config.h"
+ #include "llvm/ADT/SmallString.h"
+-#include "llvm/Config/config.h"
+ #include "llvm/ExecutionEngine/ExecutionEngine.h"
+ #include "llvm/ExecutionEngine/GenericValue.h"
+ #include "llvm/Support/ManagedStatic.h"
diff --git a/debian/patches/series b/debian/patches/series
index c7ff4f0..709eea7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 12_update_clang_deps.patch
 14_disable_pdf_install.patch
 15_remove_qwebkit.patch
+fix-llvm-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freemat.git



More information about the debian-science-commits mailing list