* New upstream release

* Install a missing library to unbreak lldb (Closes: #815809)
* New snapshot release
* Update the clang description for something more accurate (C++-11, 14, etc)
* Update debian/orig-tar.sh to remove autoconf/config.sub autoconf/config.guess
  in polly
* clang-tidy-3.8: Remove Breaks/Replaces on clang-modernize-3.8.
* Disable lldb on s390x.
* New snapshot release
* Remove build-llvm/ after the install step to save space.
  Most of the rc1 builds failed because of hd space.
* New snapshot release
* Cmake migration. Done by Andrew Wilkins. Many thanks to him
  - Update patches to set SONAME in CMake build
  - Create symlinks with ".links", don't install from build tree
  - Remove LLVM-internal tools (lit, FileCheck, not, tblgen, etc.)
  - Remove llvm-X.Y-tools package, because it contained only
    internal tools that are not intended for distribution.
  - Remove autotools-specific artifacts from packages.
  - Remove "dummy" documentation artifacts from llvm-X.Y-docs
    package. Not built/installed by CMake, not useful.
  - Update control/rules to support CMake
  - Patch LLDB SWIG interfaces to workaround a bug in SWIG
    See https://llvm.org/bugs/show_bug.cgi?id=25468
  - add missing files to clang-format
  - Add patch to fix sanitizer lit invocation
  - removed LLVM-internal tools (lit, FileCheck, not, *-tblgen, etc.);
    not installed by CMake, not intended for distribution
  - removed llvm-X.Y-tools (contained only internal tools)
  - removed autotools-specific artifacts (configure, Makefile, etc.)
  - removed dummy documentation files
This commit is contained in:
Sylvestre Ledru 2016-03-05 11:31:54 +00:00
parent ac8d009c00
commit 7138491dc0
11 changed files with 93 additions and 49 deletions

57
debian/changelog vendored
View File

@ -31,6 +31,59 @@ llvm-toolchain-snapshot (1:3.9~svn260089-1) unstable; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 16 Jan 2016 12:34:11 +0100
llvm-toolchain-3.8 (1:3.8-1) unstable; urgency=medium
* New upstream release
* Install a missing library to unbreak lldb (Closes: #815809)
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 03 Mar 2016 21:16:21 +0100
llvm-toolchain-3.8 (1:3.8~+rc3-1~exp1) experimental; urgency=medium
* New snapshot release
* Update the clang description for something more accurate (C++-11, 14, etc)
* Update debian/orig-tar.sh to remove autoconf/config.sub autoconf/config.guess
in polly
[ Matthias Klose ]
* clang-tidy-3.8: Remove Breaks/Replaces on clang-modernize-3.8.
* Disable lldb on s390x.
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 25 Feb 2016 14:26:14 +0100
llvm-toolchain-3.8 (1:3.8~+rc2-1~exp1) experimental; urgency=medium
* New snapshot release
* Remove build-llvm/ after the install step to save space.
Most of the rc1 builds failed because of hd space.
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 03 Feb 2016 08:59:32 +0100
llvm-toolchain-3.8 (1:3.8~+rc1-1~exp1) experimental; urgency=medium
* New snapshot release
* Cmake migration. Done by Andrew Wilkins. Many thanks to him
- Update patches to set SONAME in CMake build
- Create symlinks with ".links", don't install from build tree
- Remove LLVM-internal tools (lit, FileCheck, not, tblgen, etc.)
- Remove llvm-X.Y-tools package, because it contained only
internal tools that are not intended for distribution.
- Remove autotools-specific artifacts from packages.
- Remove "dummy" documentation artifacts from llvm-X.Y-docs
package. Not built/installed by CMake, not useful.
- Update control/rules to support CMake
- Patch LLDB SWIG interfaces to workaround a bug in SWIG
See https://llvm.org/bugs/show_bug.cgi?id=25468
- add missing files to clang-format
- Add patch to fix sanitizer lit invocation
- removed LLVM-internal tools (lit, FileCheck, not, *-tblgen, etc.);
not installed by CMake, not intended for distribution
- removed llvm-X.Y-tools (contained only internal tools)
- removed autotools-specific artifacts (configure, Makefile, etc.)
- removed dummy documentation files
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 20 Jan 2016 16:09:01 +0100
llvm-toolchain-snapshot (1:3.8~svn255217-1~exp1) experimental; urgency=medium
* New snapshot release
@ -46,10 +99,10 @@ llvm-toolchain-snapshot (1:3.8~svn254193-2) UNRELEASED; urgency=medium
setting the lldb archs in debian/control in just one
place would be appreciated.
* quoting fixes in debian/rules, when make macros
are empty
are empty
Thanks to Doko for the two previous changes (Closes: #806729)
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 30 Nov 2015 15:34:12 +0100
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 30 Nov 2015 15:34:12 +0100
llvm-toolchain-snapshot (1:3.8~svn254193-1) unstable; urgency=medium

View File

@ -5,6 +5,14 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements
usr/lib/llvm-@LLVM_VERSION@/bin/clang-query
usr/lib/llvm-@LLVM_VERSION@/bin/clang-rename
usr/lib/llvm-@LLVM_VERSION@/bin/sancov
usr/lib/llvm-@LLVM_VERSION@/share/scan-view/
usr/lib/llvm-@LLVM_VERSION@/share/scan-build/
usr/lib/llvm-@LLVM_VERSION@/share/man/man1/scan-build.1
usr/lib/llvm-@LLVM_VERSION@/libexec/ccc-analyzer
usr/lib/llvm-@LLVM_VERSION@/libexec/c++-analyzer
usr/lib/llvm-@LLVM_VERSION@/bin/modularize
usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test
tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/
tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/
@ -18,5 +26,7 @@ usr/bin/clang-apply-replacements-@LLVM_VERSION@
usr/bin/clang-query-@LLVM_VERSION@
usr/bin/clang-rename-@LLVM_VERSION@
usr/bin/sancov-@LLVM_VERSION@
#usr/lib/llvm-@LLVM_VERSION@/share/man/man1/clang.1
usr/bin/clang-cl-@LLVM_VERSION@
usr/bin/modularize-@LLVM_VERSION@
usr/bin/scan-build-@LLVM_VERSION@
usr/bin/scan-view-@LLVM_VERSION@

6
debian/control vendored
View File

@ -352,7 +352,7 @@ Description: Modular compiler and toolchain technologies, examples
# ------------- lldb -------------
Package: lldb-3.9
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
# ia64 mips mipsel hurd powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}), python, llvm-3.9-dev, python-lldb-3.9
Conflicts: lldb-3.4, lldb-3.5
@ -363,7 +363,7 @@ Description: Next generation, high-performance debugger
Project, such as the Clang expression parser and LLVM disassembler.
Package: liblldb-3.9
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
# ia64 mips mipsel hurd powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
@ -408,7 +408,7 @@ Description: Next generation, high-performance debugger, python lib
Package: liblldb-3.9-dev
Section: libdevel
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
# ia64 mips mipsel hurd powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.9 (= ${binary:Version})
Replaces: lldb-3.9-dev (<= 1:3.9~svn215195-2)

View File

@ -1,6 +1,7 @@
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/*.txt
#usr/lib/clang/@LLVM_VERSION_FULL@/lib /usr/lib/clang/@LLVM_VERSION@/
#usr/lib/clang/@LLVM_VERSION_FULL@/include/ /usr/include/clang/@LLVM_VERSION@/

View File

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

View File

@ -1,4 +1,5 @@
/usr/lib/llvm-@LLVM_VERSION@/include/lldb
/usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*a
/usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*so

View File

@ -1,7 +1,9 @@
usr/bin/lldb-@LLVM_VERSION@
usr/lib/llvm-@LLVM_VERSION@/bin/lldb
usr/lib/llvm-@LLVM_VERSION@/bin/lldb-mi
usr/lib/llvm-@LLVM_VERSION@/bin/lldb-server
usr/lib/llvm-@LLVM_VERSION@/bin/lldb*
usr/lib/llvm-@LLVM_VERSION@/bin/lldb-mi*
usr/lib/llvm-@LLVM_VERSION@/bin/lldb-server*
usr/lib/llvm-@LLVM_VERSION@/bin/lldb-argdumper
usr/bin/lldb-server-@LLVM_VERSION@
usr/bin/lldb-mi-@LLVM_VERSION@
usr/bin/lldb-@LLVM_VERSION@*
usr/bin/lldb-server-@LLVM_VERSION@*
usr/bin/lldb-mi-@LLVM_VERSION@*
usr/bin/lldb-argdumper-@LLVM_VERSION@

View File

@ -1,6 +1,9 @@
usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a
#usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a
usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so
usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so
usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so
usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so
usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.*
usr/lib/llvm-@LLVM_VERSION@/lib/BugpointPasses.so
usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/

2
debian/orig-tar.sh vendored
View File

@ -113,7 +113,7 @@ rm -rf $COMPILER_RT_TARGET
# Polly
POLLY_TARGET=polly_$VERSION
$SVN_CMD $(get_svn_url polly $BRANCH $TAG) $POLLY_TARGET
rm -rf $POLLY_TARGET/www
rm -rf $POLLY_TARGET/www $POLLY_TARGET/autoconf/config.sub $POLLY_TARGET/autoconf/config.guess
tar jcvf $FULL_VERSION.orig-polly.tar.bz2 $POLLY_TARGET
rm -rf $POLLY_TARGET

View File

@ -14,3 +14,6 @@ Index: llvm-toolchain-snapshot_3.9~svn260089/tools/llvm-config/llvm-config.cpp
} else if (Arg == "--link-shared") {
LinkMode = LinkModeShared;
} else if (Arg == "--link-static") {
} else {
usage();
}

40
debian/rules vendored
View File

@ -122,7 +122,7 @@ endif
LLDB_ENABLE=yes
LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc
LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x
# hurd has threading issues
ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
# Disable LLDB for this arch.
@ -354,42 +354,14 @@ ifneq (${AUTOCONF_BUILD},yes)
mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \
$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang
endif
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-cl
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/scan-build
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/scan-view
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/c-index-test
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-tblgen
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/pp-trace
# internal tools, don't care
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/count
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/not
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/FileCheck
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/Reporter.py
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ScanView.py
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/startfile.py
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lli-child-target
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lldb-argdumper
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lldb-$(LLVM_VERSION_FULL)
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lldb-mi-$(LLVM_VERSION_FULL)
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lldb-server-$(LLVM_VERSION_FULL)
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/modularize
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/libexec/c++-analyzer
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/libexec/ccc-analyzer
# rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libclang*.so
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM*.so
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb*.so
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libclang.so.1
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so.1
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly.a
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPollyISL.a
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/*.txt
# Don't think it is used
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly*a
# Probably useless
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python2.7/site-packages/six.py
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/man/man1/scan-build.1
rm -fr $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang/cmake/
rm -fr $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/scan-view/
rm -fr $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/docs/llvm/html/
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/docs/llvm/html.tar.gz
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/scan-build/scanview.css
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/scan-build/sorttable.js
# Rename binaries
mkdir -p $(DEB_INST)/usr/bin/
@ -450,7 +422,7 @@ endif
override_dh_shlibdeps:
cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ && ln -s libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so
# cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ && ln -s libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps
override_dh_installman: