* Add override_dh_makeshlibs for the libllvm or liblldb versions

Thanks to Julien Cristau for the patch
* Bring back the ocaml binding. thanks to Cyril Soldani for the patch
  (Closes: #858626)
* change the min version of the libclang1 symbols to 1:4.0-3~
* Add override_dh_makeshlibs for the libllvm or liblldb versions
  Thanks to Julien Cristau for the patch
This commit is contained in:
Sylvestre Ledru 2017-04-09 08:13:52 +00:00
commit ddc56e5e5a
5 changed files with 709 additions and 348 deletions

9
debian/changelog vendored
View File

@ -2,11 +2,18 @@ llvm-toolchain-4.0 (1:4.0-3) UNRELEASED; urgency=medium
* Explicit the dep of clang-tidy on same version of llvm to avoid
undefined symbols
* Add override_dh_makeshlibs for the libllvm or liblldb versions
Thanks to Julien Cristau for the patch
* Bring back the ocaml binding. thanks to Cyril Soldani for the patch
(Closes: #858626)
* change the min version of the libclang1 symbols to 1:4.0-3~
* Add override_dh_makeshlibs for the libllvm or liblldb versions
Thanks to Julien Cristau for the patch
[ Rebecca N. Palmer ]
* Use versioned symbols (Closes: #848368)
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 19 Mar 2017 23:11:23 +0100
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 09 Apr 2017 10:11:56 +0200
llvm-toolchain-4.0 (1:4.0-2) unstable; urgency=medium

File diff suppressed because it is too large Load Diff

2
debian/liblldb-X.Y-dev.links.in vendored Normal file
View File

@ -0,0 +1,2 @@
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so

View File

@ -1,2 +1,2 @@
#@OCAML_STDLIB_DIR@/llvm-@LLVM_VERSION@ @OCAML_STDLIB_DIR@/
#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc/html usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/
@OCAML_STDLIB_DIR@/llvm-@LLVM_VERSION@ @OCAML_STDLIB_DIR@/
usr/lib/llvm-@LLVM_VERSION@/docs/ocaml/html/html usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/

13
debian/rules vendored
View File

@ -150,8 +150,8 @@ preconfigure:
f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
echo "$$f => $$f2"; \
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \
-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
-e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \
-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
-e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \
done
@ -272,6 +272,7 @@ override_dh_prep: build_doc
build_doc:
cd $(CURDIR)/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
$(PRE_PROCESS) $(MAKE) $(NJOBS) -C "$(TARGET_BUILD)/docs" ocaml_doc
# Continue if failing, Ubuntu precise cannot generate manpages as sphinx is too old
-(cd $(TARGET_BUILD) && make $(NJOBS) docs-llvm-html docs-clang-html docs-clang-tools-html docs-polly-html docs-polly-man docs-clang-tools-man docs-clang-man docs-llvm-man)
@ -420,11 +421,21 @@ override_dh_auto_install:
cp -R $(TARGET_BUILD)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/
cp -R $(TARGET_BUILD)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra
# Rename OCaml bindings
if test -d "$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml"; then \
mkdir -p "$(DEB_INST)$(OCAML_STDLIB_DIR)"; \
mv -f "$(DEB_INST)usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml" \
"$(DEB_INST)$(OCAML_STDLIB_DIR)/llvm-$(LLVM_VERSION)"; \
fi
# Delete the target build directory to save some space on the build systems
# All the files have been installed in $(CURDIR)/debian/tmp/ already
rm -rf $(TARGET_BUILD)
override_dh_makeshlibs:
dh_makeshlibs -V1:4.0-3~
override_dh_shlibdeps:
# Ignore asan libraries. They would trigger dependencies to multiarch libraries
dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so