fix various issues

This commit is contained in:
Sylvestre Ledru 2014-09-01 17:06:54 +00:00
parent 75d1cf3b7a
commit 64b69380b4
10 changed files with 92 additions and 5 deletions

1
debian/changelog vendored
View File

@ -10,6 +10,7 @@ llvm-toolchain-3.4 (1:3.4.2-9~exp1) experimental; urgency=medium
added
* clang-3.4 should depends on binutils (for ld, at least)
(Closes: #751030)
* clang/www/analyzer/scripts/dbtree.js removed
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 30 Aug 2014 18:09:20 +0200

View File

@ -2,3 +2,10 @@
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-@LLVM_VERSION@.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/pp-trace-@LLVM_VERSION@.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz

View File

@ -1,5 +1,5 @@
# I know and I am not planning to change that.
libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1
# I know and I am not planning to change that yet.
libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@
# Provided as transition
libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so
libclang1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so

View File

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

View File

@ -0,0 +1 @@
llvm-@LLVM_VERSION@-runtime: binary-without-manpage usr/bin/lli-child-target-@LLVM_VERSION@

View File

@ -7,3 +7,4 @@ llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rt
llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-@LLVM_VERSION@.1.gz
llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-@LLVM_VERSION@.1.gz
llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/macho-dump-@LLVM_VERSION@.1.gz
llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-ranlib-@LLVM_VERSION@.1.gz

View File

@ -7,7 +7,7 @@ Index: llvm-toolchain-3.4-3.4.2/lldb/lib/Makefile
LLVMLibsOptions += -latomic
endif
- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION)
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT).$(SONAME_EXTENSION)
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT)
endif
ifeq ($(HOST_OS),FreeBSD)

74
debian/patches/remove-dbtree.diff vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -44,3 +44,4 @@ scan-build-search-path.diff
gcc-4.9-i586-linux-gnu.diff
hurd-EIEIO-undef.diff
lldb-libname.diff
remove-dbtree.diff

2
debian/source.lintian-overrides vendored Normal file
View File

@ -0,0 +1,2 @@
# Removed by patch remove-dbtree.diff
source: source-is-missing clang/www/analyzer/scripts/dbtree.js