* Merge changes from the 3.3 branch (see 1:3.3-11)

* Honor the option "nocheck"
This commit is contained in:
Sylvestre Ledru 2013-10-29 11:32:43 +00:00
parent 57e469fb01
commit f111124cf3
3 changed files with 9 additions and 3 deletions

3
debian/changelog vendored
View File

@ -1,7 +1,7 @@
llvm-toolchain-snapshot (1:3.4~svn193603-1) unstable; urgency=low llvm-toolchain-snapshot (1:3.4~svn193603-1) unstable; urgency=low
* New snapshot release * New snapshot release
* Merge changes from the 3.3 branch (see 1:3.3-10) * Merge changes from the 3.3 branch (see 1:3.3-11)
* Add lldb-3.4-dev package * Add lldb-3.4-dev package
* Remove mipsel-ftbfs.diff (applied upstream) * Remove mipsel-ftbfs.diff (applied upstream)
* Add support of coverity checker (non-free and not packaged) * Add support of coverity checker (non-free and not packaged)
@ -12,6 +12,7 @@ llvm-toolchain-snapshot (1:3.4~svn193603-1) unstable; urgency=low
* Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1 * Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1
* Also ship the python clang binding (python-clang-3.4) * Also ship the python clang binding (python-clang-3.4)
* Enable polly if the dependencies are OK * Enable polly if the dependencies are OK
* Honor the option "nocheck"
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 20 Sep 2013 05:25:17 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Fri, 20 Sep 2013 05:25:17 +0200

7
debian/rules vendored
View File

@ -104,7 +104,7 @@ else
endif endif
LLDB_ENABLE=yes LLDB_ENABLE=yes
ifneq (,$(findstring $(DEB_HOST_ARCH), hurd)) ifeq ($(DEB_HOST_ARCH),hurd-i386)
LLDB_ENABLE=no LLDB_ENABLE=no
endif endif
@ -314,6 +314,7 @@ override_dh_installdeb:
rm -f $(CURDIR)/debian/lldb-$(LLVM_VERSION)/usr/lib/python*/dist-packages/lldb/__init__.pyc rm -f $(CURDIR)/debian/lldb-$(LLVM_VERSION)/usr/lib/python*/dist-packages/lldb/__init__.pyc
ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test: override_dh_auto_test:
# LLVM tests # LLVM tests
$(MAKE) -C $(TARGET_BUILD) check || true $(MAKE) -C $(TARGET_BUILD) check || true
@ -344,6 +345,10 @@ override_dh_auto_test:
lcov --remove $$REPORT "/usr*" -o $$REPORT; \ lcov --remove $$REPORT "/usr*" -o $$REPORT; \
genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \ genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \
fi fi
else
override_dh_auto_test:
endif
override_dh_gencontrol: override_dh_gencontrol:
dh_gencontrol -- $(control_vars) dh_gencontrol -- $(control_vars)