[OpenGTL] supoprt llvm-2.9rc2's 2.9svn version string too
Rex Dieter
rdieter at fedoraproject.org
Thu Apr 14 13:44:08 UTC 2011
commit e6c2d5d94b8d36ae26590b0d67992a4963b4a4b2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Apr 14 08:46:48 2011 -0500
supoprt llvm-2.9rc2's 2.9svn version string too
OpenGTL-0.9.15.1-llvm_2.9svn.patch | 12 ++++++++++++
OpenGTL.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/OpenGTL-0.9.15.1-llvm_2.9svn.patch b/OpenGTL-0.9.15.1-llvm_2.9svn.patch
new file mode 100644
index 0000000..f77da83
--- /dev/null
+++ b/OpenGTL-0.9.15.1-llvm_2.9svn.patch
@@ -0,0 +1,12 @@
+diff -up OpenGTL-0.9.15.1/CMakeLists.txt.2.9svn OpenGTL-0.9.15.1/CMakeLists.txt
+--- OpenGTL-0.9.15.1/CMakeLists.txt.2.9svn 2011-04-14 08:40:16.967083962 -0500
++++ OpenGTL-0.9.15.1/CMakeLists.txt 2011-04-14 08:41:44.353991471 -0500
+@@ -46,7 +46,7 @@ configure_file(config-endian.h.cmake ${C
+
+ find_package(LLVM REQUIRED)
+
+-if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "2.8" AND NOT LLVM_VERSION STREQUAL "2.7" AND NOT LLVM_VERSION STREQUAL "2.9" ) # There is no way with MSVC to know the llvm version
++if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "2.8" AND NOT LLVM_VERSION STREQUAL "2.7" AND NOT LLVM_VERSION STREQUAL "2.9" AND NOT LLVM_VERSION STREQUAL "2.9svn") # There is no way with MSVC to know the llvm version
+ message(FATAL_ERROR "LLVM 2.7 or 2.8 or 2.9 is required.")
+ endif()
+
diff --git a/OpenGTL.spec b/OpenGTL.spec
index 81fd767..672bf97 100644
--- a/OpenGTL.spec
+++ b/OpenGTL.spec
@@ -15,6 +15,10 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# http://llvm.org/bugs/show_bug.cgi?id=3729
ExcludeArch: ppc64
+## local patches
+# support version = "2.9svn" too
+Patch0 : OpenGTL-0.9.15.1-llvm_2.9svn.patch
+
## upstreamable patches
Patch50: OpenGTL-0.9.15.1-version.patch
@@ -56,6 +60,7 @@ native programs that use the OpenGTL libraries.
%prep
%setup -q
+%patch0 -p1 -b .llvm_2.9svn
%patch50 -p1 -b .version
@@ -90,7 +95,8 @@ test "$(pkg-config --modversion GTLImageIO)" = "%{version}"
test "$(pkg-config --modversion OpenCTL)" = "%{version}"
test "$(pkg-config --modversion OpenShiva)" = "%{version}"
# some known failures due to missing test data
-# 91% tests passed, 16 tests failed out of 172
+# with llvm-2.8: 91% tests passed, 16 tests failed out of 172
+# with llvm-2.9-rc2: 53% tests passed, 80 tests failed out of 172
make test -C %{_target_platform} ||:
More information about the scm-commits
mailing list