* Co installation of clang (Closes: #736057)

- scan-build => scan-build-3.5
  - scan-view => scan-view-3.5
  - asan_symbolize => asan_symbolize-3.5
* Remove of pollycc
This commit is contained in:
Sylvestre Ledru 2014-08-02 11:45:38 +00:00
parent d3f85241b9
commit 50d2a7c887
6 changed files with 24 additions and 22 deletions

5
debian/NEWS vendored Normal file
View File

@ -0,0 +1,5 @@
llvm-toolchain-3.5 (1:3.5~+rc1-3~exp1) experimental; urgency=medium
* clang is now co-instalable. Available on version 3.4, 3.5 and 3.6
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 02 Aug 2014 12:57:41 +0200

8
debian/changelog vendored
View File

@ -1,7 +1,11 @@
llvm-toolchain-3.5 (1:3.5~+rc1-4) UNRELEASED; urgency=medium
llvm-toolchain-3.5 (1:3.5~+rc1-3~exp1) experimental; urgency=medium
* SVN branched. Update the Vcs- flags.
* clang-3.5 Breaks & Replaces clang (<< 1:3.5). Just like 3.4
* Co installation of clang (Closes: #736057)
- scan-build => scan-build-3.5
- scan-view => scan-view-3.5
- asan_symbolize => asan_symbolize-3.5
* Remove of pollycc
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 31 Jul 2014 18:12:59 +0200

View File

@ -9,10 +9,9 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace
usr/lib/llvm-@LLVM_VERSION@/bin/clang-query
usr/bin/c-index-test*
tools/clang/tools/scan-build /usr/share/clang/
tools/clang/tools/scan-view /usr/share/clang/
tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/
tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/
#usr/share/man/man1/clang.1 usr/share/man/man1/
debian/pollycc /usr/bin/
usr/bin/clang-@LLVM_VERSION@
usr/bin/clang++-@LLVM_VERSION@

View File

@ -1,15 +1,3 @@
usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/llvm-clang.1.gz
usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/clang++.1.gz
/usr/share/clang/scan-build/scan-build /usr/bin/scan-build
/usr/share/clang/scan-view/scan-view /usr/bin/scan-view
/usr/bin/clang /usr/bin/llvm-clang
usr/share/clang/scan-build-@LLVM_VERSION@/scan-build usr/bin/scan-build-@LLVM_VERSION@
usr/share/clang/scan-view-@LLVM_VERSION@/scan-view usr/bin/scan-view-@LLVM_VERSION@
usr/bin/clang-@LLVM_VERSION@ usr/bin/clang
usr/bin/clang++-@LLVM_VERSION@ usr/bin/clang++
usr/bin/clang-check-@LLVM_VERSION@ usr/bin/clang-check
usr/bin/clang-tblgen-@LLVM_VERSION@ usr/bin/clang-tblgen
usr/bin/c-index-test-@LLVM_VERSION@ usr/bin/c-index-test
usr/bin/clang-apply-replacements-@LLVM_VERSION@ usr/bin/clang-apply-replacements
usr/bin/clang-tidy-@LLVM_VERSION@ usr/bin/clang-tidy
usr/bin/pp-trace-@LLVM_VERSION@ usr/bin/pp-trace
usr/bin/clang-query-@LLVM_VERSION@ usr/bin/clang-query

6
debian/control vendored
View File

@ -26,8 +26,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
Provides: c-compiler, objc-compiler, c++-compiler
Recommends: llvm-3.5-dev, python
Suggests: gnustep, gnustep-devel, clang-3.5-doc
Replaces: clang (<< 1:3.5), clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt
Breaks: clang (<< 1:3.5), clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt
Replaces: clang-3.1, clang-3.2, clang-3.3,
clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt
Breaks: clang-3.1, clang-3.2, clang-3.3,
clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt
Description: C, C++ and Objective-C compiler (LLVM based)
Clang project is a C, C++, Objective C and Objective C++ front-end
for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler

6
debian/rules vendored
View File

@ -290,7 +290,7 @@ override_dh_auto_install:
fi
mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/
cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize
cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize-$(LLVM_VERSION)
# Create this fake directory to make the install libclang-common-dev happy
# under the unsupported archs of compiler-rt
@ -320,6 +320,10 @@ override_dh_auto_install:
cp -f $(CURDIR)/clang/tools/clang-format/clang-format.py clang/tools/clang-format/clang-format-$(LLVM_VERSION).py
cp -fR $(CURDIR)/clang/tools/scan-build clang/tools/scan-build-$(LLVM_VERSION)
cp -fR $(CURDIR)/clang/tools/scan-view clang/tools/scan-view-$(LLVM_VERSION)
# Remove some license files
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT \
$(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT