Merge branch 'OpenMP-integration-follow-ups' into '7'

Added version for breaks/replaces for libomp-dev and libc++-dev package

See merge request pkg-llvm-team/llvm-toolchain!11
This commit is contained in:
Sylvestre Ledru 2018-08-28 12:19:37 +00:00
commit 772b09cfc9
2 changed files with 9 additions and 6 deletions

3
debian/changelog vendored
View File

@ -11,6 +11,9 @@ llvm-toolchain-7 (1:7~+rc2-1~exp3) experimental; urgency=medium
* Enable lld on arm64, mips64el * Enable lld on arm64, mips64el
* Enable lldb on mips64el * Enable lldb on mips64el
[ Reshabh Sharma ]
* Added version for libc++ and OpenMP packages breaks/replaces
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 26 Aug 2018 14:00:14 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Sun, 26 Aug 2018 14:00:14 +0200
llvm-toolchain-7 (1:7~+rc2-1~exp2) experimental; urgency=medium llvm-toolchain-7 (1:7~+rc2-1~exp2) experimental; urgency=medium

12
debian/control vendored
View File

@ -484,8 +484,8 @@ Section: libdevel
Architecture: any Architecture: any
Depends: libomp5-7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Depends: libomp5-7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-7-doc Suggests: libomp-7-doc
Replaces: libiomp-dev (<< 3.7-1), libomp-dev Replaces: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1)
Breaks: libiomp-dev (<< 3.7-1), libomp-dev Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1)
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
@ -572,9 +572,9 @@ Architecture: any
Multi-Arch: same 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 Breaks: libc++abi1 (<< 7~+rc1-1~exp1)
Provides: libc++abi1 Provides: libc++abi1
Replaces: libc++abi1 Replaces: libc++abi1 (<< 7~+rc1-1~exp1)
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.
@ -605,9 +605,9 @@ Package: libc++-7-helpers
Architecture: all Architecture: all
Multi-Arch: foreign Multi-Arch: foreign
Depends: ${misc:Depends} Depends: ${misc:Depends}
Breaks: libc++-helpers Breaks: libc++-helpers (<< 7~+rc1-1~exp1)
Provides: libc++-helpers Provides: libc++-helpers
Replaces: libc++-helpers Replaces: libc++-helpers (<< 7~+rc1-1~exp1)
Description: LLVM C++ Standard library - build helpers Description: LLVM C++ Standard library - build helpers
libc++ is another implementation of the C++ standard library libc++ is another implementation of the C++ standard library
. .