From 1432f600f182bdfa68501e21e57a429be1b5b36b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 30 Jan 2014 00:47:19 +0000 Subject: [PATCH] * New snapshot release * polly upstream is now using the isl trunk. Disabling it for now. --- debian/changelog | 7 +++++++ debian/clang-3.5.install | 2 +- debian/rules | 8 ++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd7d6244..4aa430fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:3.5~svn200375-1~exp1) experimental; urgency=medium + + * New snapshot release + * polly upstream is now using the isl trunk. Disabling it for now. + + -- Sylvestre Ledru Wed, 29 Jan 2014 07:36:29 -0800 + llvm-toolchain-snapshot (1:3.5~svn199601-1) unstable; urgency=low * New snapshot release diff --git a/debian/clang-3.5.install b/debian/clang-3.5.install index 52350dab..26478df0 100644 --- a/debian/clang-3.5.install +++ b/debian/clang-3.5.install @@ -7,5 +7,5 @@ usr/bin/c-index-test* tools/clang/tools/scan-build /usr/share/clang/ tools/clang/tools/scan-view /usr/share/clang/ #usr/share/man/man1/clang.1 usr/share/man/man1/ -debian/pollycc /usr/bin/ +#debian/pollycc /usr/bin/ diff --git a/debian/rules b/debian/rules index 2206724b..02dbdd22 100755 --- a/debian/rules +++ b/debian/rules @@ -61,7 +61,8 @@ endif POLLY_ENABLE=no ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libisl-dev) ge 0.12.1; echo $$?),0) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libcloog-isl-dev) ge 0.18.1; echo $$?),0) -POLLY_ENABLE=yes +# polly upstream is now using the isl trunk. disabling it for now +POLLY_ENABLE=no endif endif @@ -355,8 +356,11 @@ endif # Managed by debian build system rm -f $(CURDIR)/$(TARGET_BUILD)/Release/lib/python*/site-packages/lldb/_lldb.so + # polly tests - cd $(TARGET_BUILD)/ && $(MAKE) -C tools/polly/test/ check-polly || true + if test $(POLLY_ENABLE) = yes; then \ + cd $(TARGET_BUILD)/ && $(MAKE) -C tools/polly/test/ check-polly || true; \ + fi # The compression of the code coverage report is done in the # hook B21GetCoverageResults on the server