Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=4f2d56ac25b92ebd62fdcfc9f8e0224c64fd2c20
commit 4f2d56ac25b92ebd62fdcfc9f8e0224c64fd2c20 Author: Melko <[email protected]> Date: Sun Jun 3 12:56:53 2012 +0200 opengtl-0.9.16-1-i686 * rebuild against llvm-3.1 diff --git a/source/apps-extra/opengtl/FrugalBuild b/source/apps-extra/opengtl/FrugalBuild index d781f8d..f4660d6 100644 --- a/source/apps-extra/opengtl/FrugalBuild +++ b/source/apps-extra/opengtl/FrugalBuild @@ -6,15 +6,16 @@ pkgver=0.9.16 pkgrel=1 pkgdesc="Graphics Transformation Languages" url="http://www.opengtl.org/"; -depends=('libstdc++' 'libpng>=1.4.2') -makedepends=('llvm>=3.0') +depends=('libstdc++' 'libpng>=1.4.2' 'llvm>=3.1') groups=('apps-extra') archs=('i686' 'x86_64') _F_archive_name="OpenGTL" +_F_cmake_confopts="-DOVERIDE_LLVM_ASSERT=ON" Finclude cmake _F_cd_path="OpenGTL-$pkgver" up2date="Flasttarbz2 http://www.opengtl.org/download/"; -source=(http://download.opengtl.org/${_F_archive_name}-${pkgver}.tar.bz2) -sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048') +source=(http://download.opengtl.org/${_F_archive_name}-${pkgver}.tar.bz2 llvm31.patch) +sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048' \ + '2d1c5fe0d2f6c38cbde42a5bbf814fcbaca6d9cc') # optimization OK diff --git a/source/apps-extra/opengtl/llvm31.patch b/source/apps-extra/opengtl/llvm31.patch new file mode 100644 index 0000000..fea3ec1 --- /dev/null +++ b/source/apps-extra/opengtl/llvm31.patch @@ -0,0 +1,26 @@ +diff -ur OpenGTL-0.9.16.old/CMakeLists.txt OpenGTL-0.9.16/CMakeLists.txt +--- OpenGTL-0.9.16.old/CMakeLists.txt 2011-12-28 16:01:43.000000000 +0100 ++++ OpenGTL-0.9.16/CMakeLists.txt 2012-06-03 12:48:29.023685746 +0200 +@@ -47,8 +47,8 @@ + + find_package(LLVM REQUIRED) + +-if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "3.0" ) # There is no way with MSVC to know the llvm version +- message(FATAL_ERROR "LLVM 3.0 is required.") ++if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "3.1" ) # There is no way with MSVC to know the llvm version ++ message(FATAL_ERROR "LLVM 3.1 is required.") + endif() + + if(MSVC) +diff -ur OpenGTL-0.9.16.old/OpenGTL/GTLCore/AST/Expression.cpp OpenGTL-0.9.16/OpenGTL/GTLCore/AST/Expression.cpp +--- OpenGTL-0.9.16.old/OpenGTL/GTLCore/AST/Expression.cpp 2011-12-28 16:01:43.000000000 +0100 ++++ OpenGTL-0.9.16/OpenGTL/GTLCore/AST/Expression.cpp 2012-06-03 12:55:01.894676725 +0200 +@@ -261,7 +261,7 @@ + + LLVMBackend::ExpressionResult StringExpression::generateValue( LLVMBackend::GenerationContext& _gc, LLVMBackend::ExpressionGenerationContext& _egc) const + { +- return LLVMBackend::ExpressionResult(llvm::ConstantArray::get(_gc.llvmContext(), (const std::string&)m_string, true ), Type::Integer8 ); // return a null terminated string ++ return LLVMBackend::ExpressionResult(llvm::ConstantDataArray::getString(_gc.llvmContext(), (const std::string&)m_string, true ), Type::Integer8 ); // return a null terminated string + } + + ExpressionResultSP StringExpression::generateValue( GenerationVisitor* _generationVisitor) const _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
