patch DXR to work with LLVM 7

fwyzard · Sep 20, 2018 · 920ee24 · 920ee24
1 parent 1f50be4
commit 920ee24
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/py2-dxr-clang700.patch b/py2-dxr-clang700.patch
@@ -0,0 +1,13 @@
+diff --git a/dxr/plugins/clang/dxr-index.cpp b/dxr/plugins/clang/dxr-index.cpp
+index 460d373..6b35340 100644
+--- a/dxr/plugins/clang/dxr-index.cpp
++++ b/dxr/plugins/clang/dxr-index.cpp
+@@ -923,7 +923,7 @@ public:
+       if (sm.isMacroArgExpansion(loc))
+         loc = sm.getImmediateSpellingLoc(loc);
+       else
+-        loc = sm.getImmediateExpansionRange(loc).first;
++        loc = sm.getImmediateExpansionRange(loc).getBegin();
+     }
+     return loc;
+   }
diff --git a/py2-dxr.spec b/py2-dxr.spec
@@ -16,6 +16,7 @@ Patch2: py2-dxr-fix-clang-linker-flags
 Patch3: py2-dxr-clang36
 Patch4: py2-dxr-sqlite38
 Patch5: py2-dxr-clang37
+Patch6: py2-dxr-clang700
 %define keep_archives true
 
 %prep
@@ -29,6 +30,7 @@ cd ..
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 mv trilite-%triliteCommit/* trilite
 %setup -T -D -n dxr-%dxrCommit
 

diff --git a/python_tools.spec b/python_tools.spec
@@ -145,7 +145,7 @@ Requires: py2-numpy-toolfile
 Requires: py2-sqlalchemy
 Requires: py2-pygithub
 Requires: py2-dablooms
-#Requires: py2-dxr-toolfile
+Requires: py2-dxr-toolfile
 Requires: py2-PyYAML
 Requires: py2-lint-toolfile
 Requires: py2-pip-toolfile