- adjusted polly-update patch, enabled pluto support in polly

diff --git a/llvm-polly-update.patch b/llvm-polly-update.patch
index aaa6f41dbcd8ae72570df2f19b1f6a91fd425f2a..e7c2f5fe1a6a0a2b11fc6a50733763bab796378e 100644 (file)
--- a/llvm-polly-update.patch
+++ b/llvm-polly-update.patch
@@ -39,3 +39,14 @@
    }
  }
  
+--- llvm-3.5.0.src/tools/polly/autoconf/configure.ac.orig      2014-04-11 11:47:45.000000000 +0200
++++ llvm-3.5.0.src/tools/polly/autoconf/configure.ac   2014-10-06 16:37:55.052037462 +0200
+@@ -93,7 +93,7 @@
+ 
+ dnl Check that we have libpluto.
+ saved_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS="$CXXFLAGS $gmp_inc $isl_inc"
++CXXFLAGS="$CXXFLAGS $gmp_inc $isl_inc -std=c++0x"
+ find_lib_and_headers([pluto], [pluto/libpluto.h], [pluto])
+ CXXFLAGS=$saved_CXXFLAGS
+ AS_IF([test "x$pluto_found" = "xyes"],

diff --git a/llvm.spec b/llvm.spec
index 8d90fb000b3115aedb5b89b9da4a4619a167cfee..d9a7b551e60bf94c2e01e7e881de73a6a735c64b 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -83,9 +83,8 @@ BuildRequires:        cloog-isl-devel
 BuildRequires: gmp-devel
 BuildRequires: isl-devel >= 0.13
 # optional
+BuildRequires: pluto-devel
 BuildRequires: scoplib-devel >= 0.2.1-2
-# optional
-#BuildRequires:        libpluto-devel
 #cuda-devel
 %endif
 Requires:      %{name}-libs = %{version}-%{release}
@@ -381,8 +380,8 @@ mv clang-tools-extra-%{version}.src tools/clang/tools/extra
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%{?with_polly:%patch3 -p1}
+%{?with_lldb:%patch4 -p1}
 
 # configure does not properly specify libdir
 %{__sed} -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in
@@ -403,6 +402,14 @@ cd autoconf
 %{__autoconf} -o ../configure configure.ac
 cd ..
 %{__autoheader} -I autoconf -I autoconf/m4 autoconf/configure.ac
+%if %{with polly}
+cd tools/polly/autoconf
+%{__aclocal} -I m4 -I ../../../autoconf/m4
+%{__autoconf} -o ../configure configure.ac
+cd ..
+%{__autoheader} -I autoconf -I autoconf/m4 -I ../../../autoconf/m4 autoconf/configure.ac
+cd ../..
+%endif
 
 # Disabling assertions now, rec. by pure and needed for OpenGTL
 # TESTFIX no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3801