* Remove package "clang". It is now provided by llvm-defaults.

* Install cmake files to build LLVM extensions (Closes: #701153)
* Fix the install of lli manpage (Closes: #697117)
This commit is contained in:
Sylvestre Ledru 2013-03-01 16:17:33 +00:00
parent 3444c14c9c
commit 62d95ef4af
6 changed files with 32 additions and 44 deletions

3
debian/changelog vendored
View File

@ -1,8 +1,11 @@
llvm-toolchain-3.2 (1:3.2repack-1~exp3) UNRELEASED; urgency=low
* Remove package "clang". It is now provided by llvm-defaults.
* Fix some issues relative to the epoch change
* Fix a wrong path in the _lldb.so Python symlink
* Install cmake files to build LLVM extensions (Closes: #701153)
* Remove the embedded copy of libjs-jquery (Closes: #701087)
* Fix the install of lli manpage (Closes: #697117)
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 17 Feb 2013 12:05:15 +0100

View File

@ -1 +1,2 @@
#debian/man/scan*.1
build-llvm/tools/clang/docs/tools/clang-3.2.1
clang/tools/scan-build/scan-build.1

32
debian/control vendored
View File

@ -15,34 +15,6 @@ Homepage: http://www.llvm.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/trunk/
Package: clang
Architecture: all
Depends: clang-3.2 (>= ${source:Version}), ${misc:Depends}
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. Some of its goals include the following:
.
End-User Features:
.
* Fast compiles and low memory use
* Expressive diagnostics (examples)
* GCC compatibility
.
Utility and Applications:
.
* Modular library based architecture
* Support diverse clients (refactoring, static analysis, code
generation, etc)
* Allow tight integration with IDEs
* Use the LLVM 'BSD' License
.
Internal Design and Implementation:
.
* A real-world, production quality compiler
* A simple and hackable code base
* A single unified parser for C, Objective C, C++, and Objective C++
* Conformance with C/C++/ObjC and their variants
Package: clang-3.2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libstdc++6-4.7-dev, libgcc-4.7-dev,
@ -287,7 +259,7 @@ Description: Low-Level Virtual Machine (LLVM), debugging symbols library
Package: llvm-3.2
Architecture: any
Suggests: llvm-3.2-doc
Depends: llvm-3.2-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Depends: llvm-3.2-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
Recommends: llvm-3.2-dev
Conflicts: llvm (<< 2.7-1)
Replaces: llvm (<< 2.7-1)
@ -380,7 +352,7 @@ Description: Low-Level Virtual Machine (LLVM), bindings for OCaml
Package: llvm-3.2-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}, libjs-jquery
Depends: ${misc:Depends}
Description: Low-Level Virtual Machine (LLVM), documentation
The Low-Level Virtual Machine (LLVM) is a collection of libraries and
tools that make it easy to build compilers, optimizers, Just-In-Time

View File

@ -2,20 +2,21 @@ usr/lib/llvm-3.2/lib/libLLVM*.a
usr/lib/llvm-3.2/lib/libllvm*.a
usr/lib/llvm-3.2/lib/LLVM*.so
usr/lib/llvm-3.2/lib/libLTO.*
usr/lib/llvm-3.2/include/llvm/ usr/include/llvm-3.2/
usr/lib/llvm-3.2/include/llvm/ usr/include/llvm-3.2/
usr/lib/llvm-3.2/include/llvm-c/ usr/include/llvm-c-3.2/
cmake/modules/*.cmake usr/share/llvm-3.2/cmake/
build-llvm/Makefile.common /usr/lib/llvm-3.2/build/
build-llvm/Makefile.config /usr/lib/llvm-3.2/build/
build-llvm/config.status /usr/lib/llvm-3.2/build/
Makefile.rules /usr/lib/llvm-3.2/build/
configure /usr/lib/llvm-3.2/build/
autoconf/ /usr/lib/llvm-3.2/build/
Makefile.rules /usr/lib/llvm-3.2/build/
configure /usr/lib/llvm-3.2/build/
autoconf/ /usr/lib/llvm-3.2/build/
utils/vim/llvm.vim usr/share/vim/addons/syntax/llvm-3.2.vim
utils/vim/tablegen.vim usr/share/vim/addons/syntax/tablegen-3.2.vim
utils/vim/llvm.vim usr/share/vim/addons/syntax/llvm-3.2.vim
utils/vim/tablegen.vim usr/share/vim/addons/syntax/tablegen-3.2.vim
utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.2/
utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.2/
utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.2/
utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.2/
utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.2/

View File

@ -1 +1 @@
debian/tmp//usr/lib/llvm-3.2/share/man/man1/lli*
docs/_build/man/lli*

19
debian/rules vendored
View File

@ -112,8 +112,10 @@ override_dh_auto_install:
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && mv libclang.so libclang.so.$(SONAME_EXT) && ln -s libclang.so.$(SONAME_EXT) libclang.so
# cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/ && rm -rf $$(find . -iname "SubDir.lib*" -o -iname .dir) && rm -rf $$(find -empty)
mkdir -p $(CURDIR)/debian/compiler-rt/usr/bin/
cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/compiler-rt/usr/bin/asan_symbolize
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
# Create this fake directory to make the install libclang-common-dev happy
# under the unsupported archs of compiler-rt
mkdir -p $(CURDIR)/debian/tmp/usr/lib/clang/$(LLVM_VERSION)/lib
@ -133,14 +135,23 @@ override_dh_auto_install:
echo "$$f"|grep "3\.2" || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
done
mv $(CURDIR)/build-llvm/tools/clang/docs/tools/clang.1 $(CURDIR)/build-llvm/tools/clang/docs/tools/clang-3.2.1
# Remove some license files
rm $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT
# Managed in lldb-X.Y.links.in
rm -f build-llvm/Release/lib/python*/site-packages/lldb/_lldb.so
rm -f $(CURDIR)/build-llvm/Release/lib/python*/site-packages/lldb/_lldb.so
# Remove the copy of jquery. See bug #701087
cd ./docs/_build/html/_static/ && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js
cd $(CURDIR)/docs/_build/html/_static/ && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js
override_dh_install:
dh_install
# Make sure that lli manpage is only in llvm-3.2-runtime (See #697117)
rm -f $(CURDIR)/debian/llvm-$(LLVM_VERSION)/usr/share/man/man1/lli*
.PHONY: override_dh_strip
override_dh_strip: