fix some bugs (cherry pick from 3.3)

This commit is contained in:
Sylvestre Ledru 2013-12-04 17:57:46 +00:00
parent 943b19fcdd
commit f744e8a5c2

7
debian/rules vendored
View File

@ -102,15 +102,17 @@ else
COVERITY_ENABLE=0
endif
LLDB_ENABLE=yes
LLDB_DISABLE_ARCHS := hurd-i386 mips mipsel
# hurd has threading issues
# mips* fails with "undefined references to `__atomic_load_8'"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(LLDB_DISABLE_ARCHS)))
# Disable LLDB for this arch.
LLDB_ENABLE=no
endif
%:
dh $@ --with ocaml
@ -118,6 +120,9 @@ endif
debian/%: debian/%.in
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $< > $@
# Override this two targets. They are trying to manage the .in conversion for me
override_dh_ocamlinit:
override_dh_ocamlclean:
override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/libclang1-$(LLVM_VERSION).links debian/libclang-$(LLVM_VERSION)-dev.links debian/libclang1-$(LLVM_VERSION).install debian/pollycc
echo "Using gcc: "