proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-10 10:37:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/7' into snapshot

Browse Source
This commit is contained in:
Sylvestre Ledru 2018-09-19 08:44:33 +02:00
commit 83bc245bc4
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
debian/control vendored
View File

@ -484,8 +484,9 @@ Section: libdevel
Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
Depends: libomp5-8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Depends: libomp5-8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-8-doc Suggests: libomp-8-doc
Replaces: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1)
Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1) Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1)
Conflicts: libomp-dev
Replaces: libomp-dev
Provides: libomp-dev Provides: libomp-dev
Description: LLVM OpenMP runtime - dev package Description: LLVM OpenMP runtime - dev package
The runtime is the part of the OpenMP implementation that your code is The runtime is the part of the OpenMP implementation that your code is
@ -496,8 +497,9 @@ Package: libomp5-8
Multi-Arch: same Multi-Arch: same
Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libomp5 (<< 7~+rc1-1~exp1)
Breaks: libomp5 (<< 7~+rc1-1~exp1) Breaks: libomp5 (<< 7~+rc1-1~exp1)
Conflicts: libomp5
Replaces: libomp5
Provides: libomp5 Provides: libomp5
# TODO add the break depends # TODO add the break depends
Description: LLVM OpenMP runtime Description: LLVM OpenMP runtime
@ -527,8 +529,9 @@ Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: clang Suggests: clang
Replaces: libc++1 (<< 7~+rc1-1~exp1)
Breaks: libc++1 (<< 7~+rc1-1~exp1) Breaks: libc++1 (<< 7~+rc1-1~exp1)
Conflicts: libc++1
Replaces: libc++1
Provides: libc++1 Provides: libc++1
Description: LLVM C++ Standard library Description: LLVM C++ Standard library
libc++ is another implementation of the C++ standard library. libc++ is another implementation of the C++ standard library.
@ -548,9 +551,10 @@ Section: libdevel
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Depends: libc++1-8 (= ${binary:Version}), ${misc:Depends} Depends: libc++1-8 (= ${binary:Version}), ${misc:Depends}
Provides: libc++-dev
Breaks: libc++-dev (<< 7~+rc1-1~exp1) Breaks: libc++-dev (<< 7~+rc1-1~exp1)
Replaces: libc++-dev (<< 7~+rc1-1~exp1) Conflicts: libc++-dev
Provides: libc++-dev
Replaces: libc++-dev
Description: LLVM C++ Standard library (development files) Description: LLVM C++ Standard library (development files)
libc++ is another implementation of the C++ standard library libc++ is another implementation of the C++ standard library
. .
@ -573,8 +577,9 @@ Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libc++abi1 (<< 7~+rc1-1~exp1) Breaks: libc++abi1 (<< 7~+rc1-1~exp1)
Conflicts: libc++abi1
Provides: libc++abi1 Provides: libc++abi1
Replaces: libc++abi1 (<< 7~+rc1-1~exp1) Replaces: libc++abi1
Description: LLVM low level support for a standard C++ library Description: LLVM low level support for a standard C++ library
libc++abi is another implementation of low level support for a standard C++ libc++abi is another implementation of low level support for a standard C++
library. library.
@ -589,9 +594,9 @@ Section: libdevel
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Depends: libc++abi1-8 (= ${binary:Version}), ${misc:Depends} Depends: libc++abi1-8 (= ${binary:Version}), ${misc:Depends}
Replaces: libc++-dev (<= 6.0.1-1), libc++abi-dev (<= 6.0.1-1) Breaks: libc++-dev (<= 6.0.1-1)
Breaks: libc++-dev (<= 6.0.1-1), libc++abi-dev (<= 6.0.1-1)
Provides: libc++abi-dev Provides: libc++abi-dev
Replaces: libc++abi-dev
Description: LLVM low level support for a standard C++ library (development files) Description: LLVM low level support for a standard C++ library (development files)
libc++abi is another implementation of low level support for a standard C++ libc++abi is another implementation of low level support for a standard C++
library. library.

2
debian/rules vendored
View File

@ -640,7 +640,7 @@ ifeq (${POLLY_ENABLE},yes)
ifneq (,$(filter libclang-common-$(LLVM_VERSION)-dev, $(shell dh_listpackages))) ifneq (,$(filter libclang-common-$(LLVM_VERSION)-dev, $(shell dh_listpackages)))
dh_install -p libclang-common-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly dh_install -p libclang-common-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly
# On old Debian & Ubuntu, removing the files is necessary # On old Debian & Ubuntu, removing the files is necessary
rm debian/tmp/usr/lib/llvm-$(VERSION)/lib/cmake/polly/*.cmake rm -rf debian/tmp/usr/lib/llvm-$(VERSION)/lib/cmake/polly/*.cmake
else else
rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
endif endif