[packages/OpenGTL] - added llvm-3.3 patch (from gentoo, LLVM 3.3 support) - added includes patch (missing C++ includes)
qboosh
qboosh at pld-linux.org
Sun Nov 10 21:25:46 CET 2013
commit 2c344bb55cf0d3ced536a642ebd93cc6fa2266fa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Nov 10 21:26:11 2013 +0100
- added llvm-3.3 patch (from gentoo, LLVM 3.3 support)
- added includes patch (missing C++ includes)
- added link patch (add missing -lpthread)
- finished packaging
OpenGTL-includes.patch | 10 +
OpenGTL-link.patch | 11 +
OpenGTL-llvm-3.3.patch | 732 +++++++++++++++++++++++++++++++++++++++++++++++++
OpenGTL.spec | 106 ++++---
4 files changed, 818 insertions(+), 41 deletions(-)
---
diff --git a/OpenGTL.spec b/OpenGTL.spec
index 387a266..145ca23 100644
--- a/OpenGTL.spec
+++ b/OpenGTL.spec
@@ -1,62 +1,84 @@
#
-%bcond_with tests
+# Conditional build:
+%bcond_with tests # perform "make test"
#
Summary: Graphics Transformation Languages
+Summary(pl.UTF-8): Graphics Transformation Languages - języki przekształceń graficznych
Name: OpenGTL
Version: 0.9.18
-Release: 0.1
-License: LGPLv2
+Release: 1
+License: LGPL v2+
Group: Libraries
-URL: http://opengtl.org/
Source0: http://download.opengtl.org/%{name}-%{version}.tar.bz2
# Source0-md5: 8a9673c648ef5af4fcc7f60bb8282811
%{?with_tests:Source1: http://download.opengtl.org/tests-data-%{version}.tar.bz2}
+Patch0: %{name}-llvm-3.3.patch
+Patch1: %{name}-includes.patch
+Patch2: %{name}-link.patch
+URL: http://opengtl.org/
BuildRequires: ImageMagick
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6
BuildRequires: doxygen
BuildRequires: ghostscript
BuildRequires: graphviz
BuildRequires: libpng-devel
-BuildRequires: llvm-devel >= 3.0
+BuildRequires: llvm-devel >= 3.3
BuildRequires: texlive-dvips
BuildRequires: texlive-latex
BuildRequires: zlib-devel
Requires: %{name}-libs = %{version}-%{release}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
OpenGTL provides tools, languages and libraries to create generic
transformations for graphics. These transformations can be used by
different programs, e.g. Krita, Gimp, CinePaint, etc.
+%description -l pl.UTF-8
+OpenGTL udostępnia narzędzia, języki i biblioteka do tworzenia
+ogólnych przekształceń grafiki. Przekształcenia te mogą być później
+wykorzystywane przez różne programy, takie jak Krita, Gimp czy
+CinePaint.
+
%package libs
-###### Unknown group!
-Summary: Runtime libraries for %{name}
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary: Runtime OpenGTL libraries
+Summary(pl.UTF-8): Biblioteki współdzielone OpenGTL
+Group: Libraries
%description libs
-OpenGTL libraries.
+OpenGTL shared libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki współdzielone OpenGTL.
%package devel
-Summary: Libraries and header files for %{name}
+Summary: Header files for OpenGTL
+Summary(pl.UTF-8): Pliki nagłówkowe OpenGTL
Group: Development/Languages
Requires: %{name}-libs = %{version}-%{release}
-Requires: llvm-devel
+Requires: llvm-devel >= 3.3
%description devel
-This package contains library and header files needed to develop new
-native programs that use the OpenGTL libraries.
+This package contains the header files needed to develop new native
+programs that use the OpenGTL libraries.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe niezbędne do tworzenia nowych
+programów wykorzystujących biblioteki OpenGTL.
%prep
%setup -q %{?with_tests:-a1}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
install -d build
cd build
-%cmake \
- -DOPENGTL_BUILD_TESTS:BOOL=ON \
- %{?with_tests:-DOPENGTL_TESTS_DATA:PATH=$PWD/../tests-data} \
- ..
+%cmake .. \
+ -DOPENGTL_BUILD_OpenRIJN:BOOL=ON \
+ -DOPENGTL_BUILD_TESTS:BOOL=ON \
+ %{?with_tests:-DOPENGTL_TESTS_DATA:PATH=$PWD/../tests-data}
%{__make}
@@ -64,7 +86,7 @@ cd ..
doxygen OpenGTL.doxy
%if %{with tests}
-export PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_npkgconfigdir}:%{buildroot}%{_pkgconfigdir}
+export PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_npkgconfigdir}:$RPM_BUILD_ROOT%{_pkgconfigdir}
test "$(pkg-config --modversion GTLCore)" = "%{version}"
test "$(pkg-config --modversion GTLImageIO)" = "%{version}"
test "$(pkg-config --modversion OpenCTL)" = "%{version}"
@@ -83,12 +105,15 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -C build install/fast \
DESTDIR=$RPM_BUILD_ROOT
-## unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_docdir}/OpenGTL
+# unpackaged files
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/OpenGTL
%clean
rm -rf $RPM_BUILD_ROOT
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
%doc COPYING OpenGTL/README
@@ -102,22 +127,21 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/shivanimator
%{_datadir}/OpenGTL
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
%files libs
%defattr(644,root,root,755)
-%{_libdir}/libGTLCore.so.%{version}
-%{_libdir}/libGTLFragment.so.%{version}
-%{_libdir}/libGTLImageIO.so.%{version}
-%{_libdir}/libOpenCTL.so.%{version}
-%{_libdir}/libOpenShiva.so.%{version}
-%{_libdir}/libGTLCore.so.0.8
-%{_libdir}/libGTLFragment.so.0.8
-%{_libdir}/libGTLImageIO.so.0.8
-%{_libdir}/libOpenCTL.so.0.8
-%{_libdir}/libOpenShiva.so.0.8
-%{_libdir}/GTLImageIO
+%attr(755,root,root) %{_libdir}/libGTLCore.so.%{version}
+%attr(755,root,root) %ghost %{_libdir}/libGTLCore.so.0.8
+%attr(755,root,root) %{_libdir}/libGTLFragment.so.%{version}
+%attr(755,root,root) %ghost %{_libdir}/libGTLFragment.so.0.8
+%attr(755,root,root) %{_libdir}/libGTLImageIO.so.%{version}
+%attr(755,root,root) %ghost %{_libdir}/libGTLImageIO.so.0.8
+%attr(755,root,root) %{_libdir}/libOpenCTL.so.%{version}
+%attr(755,root,root) %ghost %{_libdir}/libOpenCTL.so.0.8
+%attr(755,root,root) %{_libdir}/libOpenShiva.so.%{version}
+%attr(755,root,root) %ghost %{_libdir}/libOpenShiva.so.0.8
+%dir %{_libdir}/GTLImageIO
+%dir %{_libdir}/GTLImageIO/Extensions
+%attr(755,root,root) %{_libdir}/GTLImageIO/Extensions/lib*.so
%files devel
%defattr(644,root,root,755)
@@ -125,16 +149,16 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/ctlc
%attr(755,root,root) %{_bindir}/shivac
%attr(755,root,root) %{_bindir}/shivatester
+%attr(755,root,root) %{_libdir}/libGTLCore.so
+%attr(755,root,root) %{_libdir}/libGTLFragment.so
+%attr(755,root,root) %{_libdir}/libGTLImageIO.so
+%attr(755,root,root) %{_libdir}/libOpenCTL.so
+%attr(755,root,root) %{_libdir}/libOpenShiva.so
%{_includedir}/GTLCore
%{_includedir}/GTLFragment
%{_includedir}/GTLImageIO
%{_includedir}/OpenCTL
%{_includedir}/OpenShiva
-%{_libdir}/libGTLCore.so
-%{_libdir}/libGTLFragment.so
-%{_libdir}/libGTLImageIO.so
-%{_libdir}/libOpenCTL.so
-%{_libdir}/libOpenShiva.so
%{_pkgconfigdir}/GTLCore.pc
%{_pkgconfigdir}/GTLImageIO.pc
%{_pkgconfigdir}/OpenCTL.pc
diff --git a/OpenGTL-includes.patch b/OpenGTL-includes.patch
new file mode 100644
index 0000000..46e4cc0
--- /dev/null
+++ b/OpenGTL-includes.patch
@@ -0,0 +1,10 @@
+--- OpenGTL-0.9.18/Extensions/PngDC/PngDC.cpp.orig 2012-12-29 12:27:12.000000000 +0100
++++ OpenGTL-0.9.18/Extensions/PngDC/PngDC.cpp 2013-11-10 20:16:18.369476336 +0100
+@@ -19,6 +19,7 @@
+
+ #include "PngDC.h"
+
++#include <cstring>
+ #include <png.h>
+
+ #include <config-endian.h>
diff --git a/OpenGTL-link.patch b/OpenGTL-link.patch
new file mode 100644
index 0000000..5f86892
--- /dev/null
+++ b/OpenGTL-link.patch
@@ -0,0 +1,11 @@
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/CMakeLists.txt.orig 2012-12-29 12:27:12.000000000 +0100
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/CMakeLists.txt 2013-11-10 20:35:10.129428841 +0100
+@@ -110,7 +110,7 @@
+ set(EXTRA_GTLCORE_LINK_OPTIONS -Wl,-u,__ZTVN4llvm3JITE )
+ endif()
+
+-target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} ${EXTRA_GTLCORE_LINK_OPTIONS})
++target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} ${EXTRA_GTLCORE_LINK_OPTIONS} -lpthread)
+
+ # Set the ABI version of the library
+ set_target_properties(GTLCore PROPERTIES VERSION ${OPENGTL_LIB_VERSION} SOVERSION ${OPENGTL_LIB_SOVERSION} )
diff --git a/OpenGTL-llvm-3.3.patch b/OpenGTL-llvm-3.3.patch
new file mode 100644
index 0000000..8028097
--- /dev/null
+++ b/OpenGTL-llvm-3.3.patch
@@ -0,0 +1,732 @@
+diff -up OpenGTL-0.9.18/CMakeLists.txt.jx OpenGTL-0.9.18/CMakeLists.txt
+--- OpenGTL-0.9.18/CMakeLists.txt.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/CMakeLists.txt 2013-05-08 15:39:25.090057193 -0400
+@@ -78,8 +78,8 @@ else(MSVC)
+ FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "native bitwriter linker bitreader jit interpreter support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS )
+ endif(MSVC)
+
+-if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" OR LLVM_VERSION STREQUAL "3.2svn" OR LLVM_VERSION STREQUAL "3.2" ) ) # There is no way with MSVC to know the llvm version
+- message(FATAL_ERROR "LLVM 3.0 or 3.1 or 3.2 is required.")
++if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.3svn" OR LLVM_VERSION STREQUAL "3.3" ) ) # There is no way with MSVC to know the llvm version
++ message(FATAL_ERROR "LLVM 3.3 is required.")
+ endif()
+
+ if(MSVC)
+diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp
+--- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp 2013-05-08 15:39:25.091057197 -0400
+@@ -27,10 +27,10 @@
+ #include <climits>
+
+ // LLVM
+-#include <llvm/InstrTypes.h>
++#include <llvm/IR/InstrTypes.h>
+ // #include <llvm/Linker.h>
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/Module.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/Module.h>
+ // #include <llvm/Transforms/Utils/Cloning.h>
+ // Library Loader
+ #ifdef LLVM_27_OR_28
+@@ -214,7 +214,7 @@ bool Compiler::compile(bool _isStandardL
+ return success;
+ }
+
+-#include <llvm/ValueSymbolTable.h>
++#include <llvm/IR/ValueSymbolTable.h>
+
+ bool Compiler::importModule(const GTLCore::String& name)
+ {
+diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp
+--- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp 2013-05-08 15:39:25.091057197 -0400
+@@ -19,9 +19,9 @@
+
+ #include "ParserNG.h"
+
+-#include <llvm/Constants.h>
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/Type.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/Type.h>
+
+ #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
+ #include <GTLCore/CompilationMessage.h>
+diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp
+--- OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp 2013-05-08 15:39:25.091057197 -0400
+@@ -38,7 +38,7 @@
+ using namespace OpenCTL;
+
+ // LLVM
+-#include <llvm/Module.h>
++#include <llvm/IR/Module.h>
+ #include <llvm/Bitcode/ReaderWriter.h>
+ #ifdef LLVM_27_OR_28
+ #include <llvm/System/Path.h>
+@@ -47,8 +47,7 @@ using namespace OpenCTL;
+ #include <llvm/Support/Path.h>
+ #include <llvm/Support/DynamicLibrary.h>
+ #endif
+-#include <llvm/Module.h>
+-#include <llvm/LLVMContext.h>
++#include <llvm/IR/LLVMContext.h>
+
+ struct Module::Private {
+ Private() : moduleData(0), isStandardLibrary(false) {}
+diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp
+--- OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp 2013-05-08 15:39:25.091057197 -0400
+@@ -20,16 +20,16 @@
+ #include "Program.h"
+
+ // LLVM
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/Instructions.h>
+-#include <llvm/Module.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/Instructions.h>
++#include <llvm/IR/Module.h>
+ #include <llvm/Transforms/Utils/Cloning.h>
+
+ // Passes
+ #include <llvm/PassManager.h>
+ #include <llvm/Analysis/LoopPass.h>
+ #include <llvm/Analysis/Verifier.h>
+-#include <llvm/GlobalVariable.h>
++#include <llvm/IR/GlobalVariable.h>
+
+ // GTLCore
+ #include "GTLCore/Buffer.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp 2013-05-08 15:39:25.092057201 -0400
+@@ -20,9 +20,9 @@
+ #include "AccessorExpression.h"
+
+ #include <llvm/ADT/ArrayRef.h>
+-#include <llvm/Constants.h>
+-#include <llvm/Function.h>
+-#include <llvm/Instructions.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/Instructions.h>
+
+ #include "../LLVMBackend/CodeGenerator_p.h"
+ #include "../LLVMBackend/ExpressionResult_p.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp 2013-05-08 15:39:25.092057201 -0400
+@@ -19,7 +19,7 @@
+
+ #include "BinaryExpression.h"
+
+-#include <llvm/Instructions.h>
++#include <llvm/IR/Instructions.h>
+
+ #include <GTLCore/Debug.h>
+ #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400
+@@ -19,10 +19,10 @@
+
+ #include "CompoundExpression.h"
+
+-#include <llvm/Constants.h>
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/GlobalVariable.h>
+-#include <llvm/Instructions.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/GlobalVariable.h>
++#include <llvm/IR/Instructions.h>
+
+ #include "../LLVMBackend/CodeGenerator_p.h"
+ #include "../Debug.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400
+@@ -19,10 +19,10 @@
+
+ #include "ConstantCompoundExpression.h"
+
+-#include <llvm/Constants.h>
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/GlobalVariable.h>
+-#include <llvm/Instructions.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/GlobalVariable.h>
++#include <llvm/IR/Instructions.h>
+
+ #include "../LLVMBackend/CodeGenerator_p.h"
+ #include "../Debug.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp 2013-05-08 15:39:25.093057205 -0400
+@@ -19,11 +19,11 @@
+
+ #include "Expression.h"
+
+-#include <llvm/Constant.h>
+-#include <llvm/Constants.h>
+-#include <llvm/Function.h>
+-#include <llvm/GlobalVariable.h>
+-#include <llvm/Instructions.h>
++#include <llvm/IR/Constant.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/GlobalVariable.h>
++#include <llvm/IR/Instructions.h>
+
+ #include "GTLCore/LLVMBackend/CodeGenerator_p.h"
+ #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp 2013-05-08 15:39:25.093057205 -0400
+@@ -19,10 +19,10 @@
+
+ #include "FunctionDeclaration.h"
+
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/Function.h>
+-#include <llvm/Instructions.h>
+-#include <llvm/Type.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/Instructions.h>
++#include <llvm/IR/Type.h>
+
+ #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
+ #include <GTLCore/LLVMBackend/ExpressionResult_p.h>
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp 2013-05-08 15:39:25.093057205 -0400
+@@ -21,8 +21,8 @@
+
+ #include <stdlib.h>
+
+-#include <llvm/Constant.h>
+-#include <llvm/Instructions.h>
++#include <llvm/IR/Constant.h>
++#include <llvm/IR/Instructions.h>
+
+ #include "../Type.h"
+ #include "../LLVMBackend/CodeGenerator_p.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp 2013-05-08 15:39:25.093057205 -0400
+@@ -21,12 +21,12 @@
+
+ // LLVM
+ #include <llvm/ADT/ArrayRef.h>
+-#include <llvm/BasicBlock.h>
+-#include <llvm/Constants.h>
+-#include <llvm/Function.h>
+-#include <llvm/GlobalVariable.h>
+-#include <llvm/Instructions.h>
+-#include <llvm/Module.h>
++#include <llvm/IR/BasicBlock.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/GlobalVariable.h>
++#include <llvm/IR/Instructions.h>
++#include <llvm/IR/Module.h>
+
+ // GTLCore
+ #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp 2013-05-08 15:39:25.094057209 -0400
+@@ -19,9 +19,9 @@
+
+ #include "Tree.h"
+
+-#include <llvm/Constant.h>
+-#include <llvm/GlobalVariable.h>
+-#include <llvm/Type.h>
++#include <llvm/IR/Constant.h>
++#include <llvm/IR/GlobalVariable.h>
++#include <llvm/IR/Type.h>
+
+ #include "FunctionDeclaration.h"
+
+@@ -37,8 +37,8 @@
+ #include "GTLCore/LLVMBackend/Visitor_p.h"
+
+ #include "Expression.h"
+-#include <llvm/Module.h>
+-#include <llvm/DerivedTypes.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/DerivedTypes.h>
+
+ using namespace GTLCore::AST;
+
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp 2013-05-08 15:39:25.094057209 -0400
+@@ -22,9 +22,9 @@
+ #include <map>
+ #include <fstream>
+
+-#include <llvm/Module.h>
+-#include <llvm/Value.h>
+-#include <llvm/Type.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/Value.h>
++#include <llvm/IR/Type.h>
+ #include <llvm/Support/Path.h>
+ #include <llvm/Support/raw_ostream.h>
+
+@@ -418,9 +418,9 @@ namespace GTLCore {
+
+ #ifdef OPENGTL_ENABLE_DEBUG_OUTPUT
+
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/Function.h>
+-#include <llvm/Type.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/Type.h>
+
+ void compareFunctionParameters( llvm::Value* func, const std::vector<llvm::Value*>& params )
+ {
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp 2013-05-08 15:39:25.094057209 -0400
+@@ -21,9 +21,9 @@
+
+ #include <llvm/ExecutionEngine/GenericValue.h>
+ #include <llvm/ExecutionEngine/ExecutionEngine.h>
+-#include <llvm/Function.h>
+-
+-#include <llvm/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
++#include <llvm/IR/Function.h>
++#include <llvm/IR/Instructions.h>
++#include <llvm/IR/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
+
+ #include "VirtualMachine_p.h"
+
+@@ -35,7 +35,6 @@
+ #include "LLVMBackend/GenerationContext_p.h"
+ #include "ModuleData_p.h"
+ #include "LLVMBackend/CodeGenerator_p.h"
+-#include <llvm/Instructions.h>
+ #include "Type_p.h"
+ #include <GTLCore/Parameter.h>
+ #include "PrimitiveTypesTraits_p.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp 2013-05-08 15:39:25.094057209 -0400
+@@ -21,9 +21,9 @@
+
+ #include <cstdarg>
+
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/Module.h>
+-#include <llvm/Type.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/Type.h>
+
+ #include "Parameter.h"
+
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp 2013-05-08 15:39:25.095057213 -0400
+@@ -19,12 +19,12 @@
+
+ #include "CodeGenerator_p.h"
+
+-#include <llvm/CallingConv.h>
+-#include <llvm/Constants.h>
+-#include <llvm/Function.h>
+-#include <llvm/Instructions.h>
+-#include <llvm/Module.h>
+-#include <llvm/Value.h>
++#include <llvm/IR/CallingConv.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/Instructions.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/Value.h>
+
+ #include "GTLCore/Debug.h"
+ #include "ExpressionResult_p.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp 2013-05-08 15:39:25.095057213 -0400
+@@ -20,7 +20,7 @@
+ #include "ContextManager_p.h"
+
+ #include <llvm/Support/ThreadLocal.h>
+-#include <llvm/LLVMContext.h>
++#include <llvm/IR/LLVMContext.h>
+
+ using namespace LLVMBackend;
+
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp 2013-05-08 15:39:25.095057213 -0400
+@@ -20,7 +20,7 @@
+ #include "ExpressionGenerationContext_p.h"
+
+ #include "GTLCore/Debug.h"
+-#include <llvm/BasicBlock.h>
++#include <llvm/IR/BasicBlock.h>
+
+ #include "GTLCore/Macros_p.h"
+
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp 2013-05-08 15:39:25.095057213 -0400
+@@ -19,8 +19,8 @@
+
+ #include "ExpressionResult_p.h"
+
+-#include "llvm/Constant.h"
+-#include "llvm/DerivedTypes.h"
++#include "llvm/IR/Constant.h"
++#include "llvm/IR/DerivedTypes.h"
+
+ #include "../Type.h"
+ #include "../Type_p.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp 2013-05-08 15:39:25.096057217 -0400
+@@ -22,8 +22,8 @@
+ #include "GTLCore/ModuleData_p.h"
+ #include "GTLCore/Debug.h"
+
+-#include "llvm/BasicBlock.h"
+-#include "llvm/Function.h"
++#include "llvm/IR/BasicBlock.h"
++#include "llvm/IR/Function.h"
+
+ #include "GTLCore/AST/Statement.h"
+
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp 2013-05-08 15:39:25.096057217 -0400
+@@ -20,12 +20,12 @@
+ #include "Visitor_p.h"
+
+ // LLVM
+-#include <llvm/BasicBlock.h>
+-#include <llvm/Constants.h>
+-#include <llvm/Function.h>
+-#include <llvm/Instructions.h>
+-#include <llvm/Module.h>
+-#include <llvm/GlobalVariable.h>
++#include <llvm/IR/BasicBlock.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/Instructions.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/GlobalVariable.h>
+
+ // GTLCore
+ #include "CodeGenerator_p.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp 2013-05-08 15:41:21.422512114 -0400
+@@ -21,7 +21,7 @@
+
+ #include <sstream>
+
+-#include <llvm/Module.h>
++#include <llvm/IR/Module.h>
+ #include <llvm/PassManager.h>
+ #include <llvm/Target/TargetMachine.h>
+ #include <llvm/Analysis/Verifier.h>
+@@ -242,7 +242,7 @@ void ModuleData::doLink()
+ GTL_ASSERT( not m_llvmLinkedModule );
+ m_llvmLinkedModule = m_llvmModule;
+ m_llvmModule = llvm::CloneModule( m_llvmModule );
+- llvm::Linker linker("", m_llvmLinkedModule);
++ llvm::Linker linker(m_llvmLinkedModule);
+ std::string errorMessage;
+ foreach( const llvm::Module* mod, m_linkModuleWith )
+ {
+@@ -270,18 +270,11 @@ void ModuleData::doLink()
+ hide.push_back(name);
+ }
+ }
+- linker.LinkInModule( clone, &errorMessage );
++ linker.linkInModule( clone, &errorMessage );
+
+ GTL_DEBUG("Linking error: " << errorMessage );
+ delete clone;
+ }
+- foreach( const GTLCore::String& mod, m_linkModuleWithArchives )
+- {
+- bool v = false;
+- linker.LinkInArchive( llvm::sys::Path( (const std::string&) mod), v);
+- }
+-
+- linker.releaseModule();
+
+ // Hide symbols
+ foreach(GTLCore::String name, hide)
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp 2013-05-08 15:39:25.096057217 -0400
+@@ -25,7 +25,7 @@
+
+ #include <iostream>
+
+-#include <llvm/DerivedTypes.h>
++#include <llvm/IR/DerivedTypes.h>
+
+ #include "wrappers/StructWrap.h"
+ #include "SharedPointer.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp 2013-05-08 15:39:25.097057221 -0400
+@@ -30,8 +30,8 @@
+
+ using namespace GTLCore;
+
+-#include <llvm/Type.h>
+-#include <llvm/DerivedTypes.h>
++#include <llvm/IR/Type.h>
++#include <llvm/IR/DerivedTypes.h>
+
+ Type::StructDataMember::Information::~Information()
+ {
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp 2013-05-08 15:39:25.097057221 -0400
+@@ -19,8 +19,8 @@
+
+ #include "Value_p.h"
+
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/Type.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/Type.h>
+
+ #include "Debug.h"
+ #include "Value.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp 2013-05-08 15:39:25.097057221 -0400
+@@ -19,8 +19,8 @@
+
+ #include "VariableNG_p.h"
+
+-#include <llvm/Constants.h>
+-#include <llvm/Instructions.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/Instructions.h>
+
+ #include "LLVMBackend/CodeGenerator_p.h"
+ #include "Debug.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp 2013-05-08 15:39:25.097057221 -0400
+@@ -21,10 +21,10 @@
+
+ // JIT
+ #include <llvm/ExecutionEngine/ExecutionEngine.h>
+-#include <llvm/Module.h>
+-#include <llvm/DerivedTypes.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/DerivedTypes.h>
+ #include <llvm/Target/TargetOptions.h>
+-#include <llvm/LLVMContext.h>
++#include <llvm/IR/LLVMContext.h>
+ #include <llvm/Support/CommandLine.h>
+ #include <llvm/Support/Threading.h>
+ #include <llvm/Support/ErrorHandling.h>
+@@ -48,7 +48,8 @@ struct VirtualMachine::Private {
+ VirtualMachine* VirtualMachine::Private::virtualMachine = 0;
+ int VirtualMachine::Private::optimLevel = 2;
+
+-void gtl_llvm_error_handler(void *user_data, const std::string& reason)
++void gtl_llvm_error_handler(void *user_data, const std::string& reason,
++ bool gen_crash_diag)
+ {
+ GTL_ABORT(reason);
+ }
+@@ -58,11 +59,7 @@ VirtualMachine::VirtualMachine() : d(new
+ {
+ d->executionEngine = 0;
+
+-#ifdef LLVM_27
+- llvm::llvm_install_error_handler(>l_llvm_error_handler);
+-#else
+- llvm::install_fatal_error_handler(>l_llvm_error_handler);
+-#endif
++ llvm::install_fatal_error_handler(gtl_llvm_error_handler);
+
+ llvm::llvm_start_multithreaded();
+
+diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp 2013-05-08 15:39:25.097057221 -0400
+@@ -19,7 +19,7 @@
+
+ #include "Compiler_p.h"
+
+-#include <llvm/Module.h>
++#include <llvm/IR/Module.h>
+ #include <llvm/PassManager.h>
+
+ #include "GTLCore/AST/Expression.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp 2013-05-08 15:39:25.098057225 -0400
+@@ -22,9 +22,9 @@
+
+ #include <sstream>
+
+-#include <llvm/Module.h>
++#include <llvm/IR/Module.h>
+ #include <llvm/Support/DynamicLibrary.h>
+-#include <llvm/LLVMContext.h>
++#include <llvm/IR/LLVMContext.h>
+
+ #include "GTLCore/CompilationMessage.h"
+ #include "GTLCore/Function.h"
+diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp
+--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp 2013-05-08 15:39:25.098057225 -0400
+@@ -29,7 +29,7 @@
+
+ #include "Library.h"
+ #include <GTLCore/Function_p.h>
+-#include <llvm/Module.h>
++#include <llvm/IR/Module.h>
+ #include <GTLCore/Type_p.h>
+
+ using namespace GTLFragment;
+diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp
+--- OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp 2013-05-08 15:39:25.098057225 -0400
+@@ -21,14 +21,14 @@
+
+ #include <vector>
+
+-#include <llvm/CallingConv.h>
+-#include <llvm/Constants.h>
+-#include <llvm/Constant.h>
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/Function.h>
+-#include <llvm/Instructions.h>
+-#include <llvm/Module.h>
+-#include <llvm/Value.h>
++#include <llvm/IR/CallingConv.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/Constant.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/Instructions.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/Value.h>
+
+ #include "GTLCore/LLVMBackend/CodeGenerator_p.h"
+ #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
+diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp
+--- OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp 2013-05-08 15:39:25.098057225 -0400
+@@ -28,13 +28,13 @@
+ #include "CodeGenerator_p.h"
+ #include <GTLFragment/wrappers/ColorWrap_p.h>
+ #include <GTLCore/Type_p.h>
+-#include <llvm/Value.h>
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/CallingConv.h>
+-#include <llvm/Module.h>
++#include <llvm/IR/Value.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/CallingConv.h>
++#include <llvm/IR/Module.h>
+ #include <GTLCore/LLVMBackend/ExpressionGenerationContext_p.h>
+ #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
+-#include <llvm/Instructions.h>
++#include <llvm/IR/Instructions.h>
+ #include <GTLCore/TypesManager.h>
+
+ using namespace OpenShiva;
+diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp
+--- OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp 2013-05-08 15:39:25.099057228 -0400
+@@ -22,7 +22,7 @@
+ #include <sstream>
+ #include <fstream>
+
+-#include <llvm/Module.h>
++#include <llvm/IR/Module.h>
+
+ #include "GTLCore/CompilationMessage.h"
+ #include "GTLCore/Function.h"
+@@ -48,7 +48,7 @@
+ #include "wrappers/ImageWrap_p.h"
+ #include "wrappers/RegionWrap_p.h"
+ #include <GTLCore/AST/Tree.h>
+-#include <llvm/DerivedTypes.h>
++#include <llvm/IR/DerivedTypes.h>
+
+ using namespace OpenShiva;
+
+diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp
+--- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp 2013-05-08 15:39:25.099057228 -0400
+@@ -19,7 +19,8 @@
+
+ #include "PixelConvertExpressionFactory_p.h"
+
+-#include <llvm/Instructions.h>
++#include <llvm/IR/Instructions.h>
++#include <llvm/IR/Function.h>
+
+ #include "GTLCore/Type.h"
+ #include "GTLCore/AST/ConvertExpression.h"
+@@ -34,7 +35,6 @@
+ #include <GTLCore/VariableNG_p.h>
+ #include <GTLCore/LLVMBackend/Visitor_p.h>
+ #include <GTLFragment/wrappers/ColorWrap_p.h>
+-#include <llvm/Function.h>
+ #include <GTLCore/Type_p.h>
+
+ using namespace OpenShiva;
+diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp
+--- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp 2013-05-08 15:39:25.099057228 -0400
+@@ -20,11 +20,11 @@
+ #include "PixelVisitor_p.h"
+
+ // LLVM
+-#include <llvm/Constant.h>
+-#include <llvm/Constants.h>
+-#include <llvm/BasicBlock.h>
+-#include <llvm/Instructions.h>
+-#include <llvm/Function.h>
++#include <llvm/IR/Constant.h>
++#include <llvm/IR/Constants.h>
++#include <llvm/IR/BasicBlock.h>
++#include <llvm/IR/Instructions.h>
++#include <llvm/IR/Function.h>
+
+ #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
+ #include "GTLCore/LLVMBackend/ExpressionGenerationContext_p.h"
+diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp
+--- OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp 2013-05-08 15:39:25.099057228 -0400
+@@ -22,9 +22,9 @@
+ #include <map>
+ #include <vector>
+
+-#include <llvm/DerivedTypes.h>
+-#include <llvm/Function.h>
+-#include <llvm/Module.h>
++#include <llvm/IR/DerivedTypes.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/Module.h>
+
+ #include "GTLCore/Function_p.h"
+ #include "GTLCore/Macros.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/OpenGTL.git/commitdiff/2c344bb55cf0d3ced536a642ebd93cc6fa2266fa
More information about the pld-cvs-commit
mailing list