From e5cf5438bb0facb9fb9dd795fbfaeccc51520adb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Mar 2013 16:44:39 +0000 Subject: [PATCH] * Enable r600 experimental backend * Remove package "clang". It is now provided by llvm-defaults. * 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) --- debian/changelog | 7 ++++++- debian/clang-3.3.manpages | 3 ++- debian/control | 30 +----------------------------- debian/lldb-3.3.links.in | 3 ++- debian/llvm-3.3-dev.install | 18 +++++++++--------- debian/llvm-3.3-runtime.manpages | 3 ++- debian/rules | 25 +++++++++++++++++++++---- 7 files changed, 43 insertions(+), 46 deletions(-) diff --git a/debian/changelog b/debian/changelog index c25c8792..bb4bcd17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ llvm-toolchain (1:3.3~svn176083-1~exp1) experimental; urgency=low * Draft of a snapshot release (3.3) + * Enable r600 experimental backend -- Sylvestre Ledru Tue, 26 Feb 2013 13:49:57 +0100 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 Sun, 17 Feb 2013 12:05:15 +0100 @@ -38,6 +44,5 @@ llvm-toolchain-3.2 (3.2repack-1~exp1) experimental; urgency=low * Add a script pollycc which will call clang with the right arguments. * Use __builtin___clear_cache on ARM to fix a clang bug. Thanks to Matthias Klose. - * Enable the r600 experimental backend for mesa 9.1. -- Sylvestre Ledru Sat, 09 Feb 2013 12:14:10 +0100 diff --git a/debian/clang-3.3.manpages b/debian/clang-3.3.manpages index e9475fdd..369700ed 100644 --- a/debian/clang-3.3.manpages +++ b/debian/clang-3.3.manpages @@ -1 +1,2 @@ -#debian/man/scan*.1 +build-llvm/tools/clang/docs/tools/clang-3.3.1 +clang/tools/scan-build/scan-build.1 diff --git a/debian/control b/debian/control index 4b5038fd..ee13346e 100644 --- a/debian/control +++ b/debian/control @@ -15,34 +15,6 @@ Homepage: http://www.llvm.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snapshot/ -Package: clang -Architecture: all -Depends: clang-3.3 (>= ${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.3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, @@ -287,7 +259,7 @@ Description: Low-Level Virtual Machine (LLVM), debugging symbols library Package: llvm-3.3 Architecture: any Suggests: llvm-3.3-doc -Depends: llvm-3.3-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: llvm-3.3-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libjs-jquery Recommends: llvm-3.3-dev Conflicts: llvm (<< 2.7-1) Replaces: llvm (<< 2.7-1) diff --git a/debian/lldb-3.3.links.in b/debian/lldb-3.3.links.in index 0f0527b4..7a4740ba 100644 --- a/debian/lldb-3.3.links.in +++ b/debian/lldb-3.3.links.in @@ -1 +1,2 @@ -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so +usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so +usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so usr/lib/python2.7/dist-packages/lldb/_lldb.so diff --git a/debian/llvm-3.3-dev.install b/debian/llvm-3.3-dev.install index 4c896fde..57f8d0c6 100644 --- a/debian/llvm-3.3-dev.install +++ b/debian/llvm-3.3-dev.install @@ -2,20 +2,20 @@ usr/lib/llvm-3.3/lib/libLLVM*.a usr/lib/llvm-3.3/lib/libllvm*.a usr/lib/llvm-3.3/lib/LLVM*.so usr/lib/llvm-3.3/lib/libLTO.* -usr/lib/llvm-3.3/include/llvm/ usr/include/llvm-3.3/ +usr/lib/llvm-3.3/include/llvm/ usr/include/llvm-3.3/ usr/lib/llvm-3.3/include/llvm-c/ usr/include/llvm-c-3.3/ +cmake/modules/*.cmake usr/share/llvm-3.3/cmake/ build-llvm/Makefile.common /usr/lib/llvm-3.3/build/ build-llvm/Makefile.config /usr/lib/llvm-3.3/build/ build-llvm/config.status /usr/lib/llvm-3.3/build/ -Makefile.rules /usr/lib/llvm-3.3/build/ -configure /usr/lib/llvm-3.3/build/ -autoconf/ /usr/lib/llvm-3.3/build/ +Makefile.rules /usr/lib/llvm-3.3/build/ +configure /usr/lib/llvm-3.3/build/ +autoconf/ /usr/lib/llvm-3.3/build/ -utils/vim/llvm.vim usr/share/vim/addons/syntax/llvm-3.3.vim -utils/vim/tablegen.vim usr/share/vim/addons/syntax/tablegen-3.3.vim +utils/vim/llvm.vim usr/share/vim/addons/syntax/llvm-3.3.vim +utils/vim/tablegen.vim usr/share/vim/addons/syntax/tablegen-3.3.vim -utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.3/ -utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.3/ +utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.3/ +utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.3/ utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.3/ - diff --git a/debian/llvm-3.3-runtime.manpages b/debian/llvm-3.3-runtime.manpages index 53289c8c..0f0bf921 100644 --- a/debian/llvm-3.3-runtime.manpages +++ b/debian/llvm-3.3-runtime.manpages @@ -1 +1,2 @@ -debian/tmp//usr/lib/llvm-3.3/share/man/man1/lli* +docs/_build/man/lli* + diff --git a/debian/rules b/debian/rules index 53b3ef15..d1725f38 100755 --- a/debian/rules +++ b/debian/rules @@ -111,11 +111,11 @@ override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LL --with-binutils-include=/usr/include \ --with-cloog --with-isl \ --with-bug-report-url=http://bugs.debian.org/ \ - --enable-shared \ + --enable-shared --enable-experimental-targets=R600 \ CLANG_VENDOR=Debian || { cat config.log tools/polly/config.log; exit 1; } # cd $(TARGET_BUILD) && cmake ../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON # mkdir build-compiler-rt && cd build-compiler-rt && cmake ../compiler-rt -# --enable-experimental-targets=R600 + override_dh_auto_build: $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=Debian CXXFLAGS=-std=c++0x REQUIRES_RTTI=1 @@ -134,8 +134,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 @@ -155,9 +157,24 @@ 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 $(CURDIR)/build-llvm/Release/lib/python*/site-packages/lldb/_lldb.so + +# Remove the copy of jquery. See bug #701087 + cd $(CURDIR)/docs/_build/html/_static/ && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js + + +override_dh_installman: + dh_installman +# 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: dh_strip -p libclang$(SONAME_EXT) --dbg-package=libclang$(SONAME_EXT)-dbg